diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml --- a/.github/workflows/android_ci.yml +++ b/.github/workflows/android_ci.yml @@ -14,26 +14,11 @@ jobs: build: - runs-on: ubuntu-22.04 + runs-on: macos-14 steps: - uses: actions/checkout@v3 - - name: Delete some stuff to free up disk space - run: | - sudo rm -rf /usr/share/dotnet - sudo rm -rf /opt/ghc - sudo rm -rf /usr/local/share/boost - - - name: Clear unused NDKs - run: | - ls -1 "$ANDROID_SDK_ROOT/ndk" | - awk '{ - if (system("git grep " $0 " > /dev/null")) { - system("rm -rf '"$ANDROID_SDK_ROOT/ndk/"'" $0); - } - }' - - name: rustup target add aarch64-linux-android arm-linux-androideabi x86_64-linux-android run: rustup target add aarch64-linux-android arm-linux-androideabi x86_64-linux-android @@ -53,11 +38,11 @@ run: echo "$ANDROID_KEY_STORE_B64" > ANDROID_KEY_STORE_B64.b64 - name: Save ANDROID_KEY_STORE to file - run: base64 -d ANDROID_KEY_STORE_B64.b64 > android_key_store.keystore + run: base64 -d -i ANDROID_KEY_STORE_B64.b64 -o android_key_store.keystore - name: Configure gradle.properties run: | - mkdir ~/.gradle + mkdir -p ~/.gradle touch ~/.gradle/gradle.properties echo "COMM_UPLOAD_STORE_FILE=$(pwd)/android_key_store.keystore" >> ~/.gradle/gradle.properties echo "COMM_UPLOAD_KEY_ALIAS=AndroidSigningKey" >> ~/.gradle/gradle.properties @@ -66,7 +51,4 @@ working-directory: ./native/android env: ANDROID_SIGNING_PASSWORD: ${{secrets.ANDROID_SIGNING_PASSWORD}} - run: ./gradlew bundleRelease "-Dorg.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=6g" - - - name: Disk Usage - run: df -h + run: JAVA_HOME=${JAVA_HOME_11_arm64} ./gradlew bundleRelease diff --git a/.github/workflows/android_release.yml b/.github/workflows/android_release.yml --- a/.github/workflows/android_release.yml +++ b/.github/workflows/android_release.yml @@ -7,26 +7,11 @@ jobs: build: - runs-on: ubuntu-22.04 + runs-on: macos-14 steps: - uses: actions/checkout@v3 - - name: Delete some stuff to free up disk space - run: | - sudo rm -rf /usr/share/dotnet - sudo rm -rf /opt/ghc - sudo rm -rf /usr/local/share/boost - - - name: Clear unused NDKs - run: | - ls -1 "$ANDROID_SDK_ROOT/ndk" | - awk '{ - if (system("git grep " $0 " > /dev/null")) { - system("rm -rf '"$ANDROID_SDK_ROOT/ndk/"'" $0); - } - }' - - name: rustup target add aarch64-linux-android arm-linux-androideabi x86_64-linux-android run: rustup target add aarch64-linux-android arm-linux-androideabi x86_64-linux-android @@ -52,11 +37,11 @@ run: echo "$ANDROID_KEY_STORE_B64" > ANDROID_KEY_STORE_B64.b64 - name: Save ANDROID_KEY_STORE to file - run: base64 -d ANDROID_KEY_STORE_B64.b64 > android_key_store.keystore + run: base64 -d -i ANDROID_KEY_STORE_B64.b64 -o android_key_store.keystore - name: Configure gradle.properties run: | - mkdir ~/.gradle + mkdir -p ~/.gradle touch ~/.gradle/gradle.properties echo "COMM_UPLOAD_STORE_FILE=$(pwd)/android_key_store.keystore" >> ~/.gradle/gradle.properties echo "COMM_UPLOAD_KEY_ALIAS=AndroidSigningKey" >> ~/.gradle/gradle.properties @@ -65,7 +50,7 @@ working-directory: ./native/android env: ANDROID_SIGNING_PASSWORD: ${{secrets.ANDROID_SIGNING_PASSWORD}} - run: ./gradlew bundleRelease "-Dorg.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=6g" + run: JAVA_HOME=${JAVA_HOME_11_arm64} ./gradlew bundleRelease - name: Save PLAY_STORE_PUBLISHING_KEY to file working-directory: ./native/android @@ -76,6 +61,3 @@ - name: Upload to Google Play working-directory: ./native/android run: node upload-aab.js - - - name: Disk Usage - run: df -h