Fix mac sed

https://stackoverflow.com/questions/12272065
vvb2060 · Dec 16, 2023 · 928248f · 928248f
1 parent 82a834b
commit 928248f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -27,23 +27,23 @@ jobs:
           echo 'org.gradle.caching=true' >> gradle.properties
           echo 'org.gradle.parallel=true' >> gradle.properties
           echo '84831b9409646a918e30573bab4c9c91346d8abd' > $ANDROID_SDK_ROOT/licenses/android-sdk-preview-license
-          sed -i 's?return X509_CERT_DIR;?return "/system/etc/security/cacerts";?' boringssl/src/main/native/src/crypto/x509/x509_def.c
+          sed -i '' 's?return X509_CERT_DIR;?return "/system/etc/security/cacerts";?' boringssl/src/main/native/src/crypto/x509/x509_def.c
       - name: Build with Gradle
         run: |
           ./gradlew :b:publishToMavenLocal
           ./gradlew :a:assemble
       - name: Test with Gradle
         run: |
           ./gradlew :a:allDevicesDebugAndroidTest
-          ls -l app/build/outputs/androidTest-results/managedDevice/atd64bit/testlog
-          rm -v app/build/outputs/androidTest-results/managedDevice/*/testlog/adb.additional_test_output*
+          ls -l app/build/outputs/androidTest-results/managedDevice/debug/atd64bit/testlog
+          rm -v app/build/outputs/androidTest-results/managedDevice/*/*/testlog/adb.additional_test_output*
       - name: Upload app
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: app
           path: app/build/outputs
       - name: Upload library
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: library
           path: ~/.m2
diff --git a/settings.gradle b/settings.gradle
@@ -14,8 +14,8 @@ dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         google()
-        mavenLocal()
         mavenCentral()
+        mavenLocal()
     }
 }
 include ':boringssl'