From fd952c3d162051f4961f42da9900cf4edd99fb23 Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Wed, 11 Sep 2024 18:36:15 -0400 Subject: [PATCH 1/6] update NDK version to 27.1.12297006 --- examples/README.md | 2 +- platform/jvm/capture/build.gradle.kts | 2 +- tools/android_sdk_wrapper.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/README.md b/examples/README.md index c96ece44..e4013ef6 100644 --- a/examples/README.md +++ b/examples/README.md @@ -78,7 +78,7 @@ Setup the environment, open Android Studio. ![](../docs/images/android_local_gradle_error.png) - - Go to Tools > SDK Manager > Android SDK > SDK Tools. Make sure that "Show Package Details" is checked and install the NDK version that is required by the project (currently `27.0.12077973`). + - Go to Tools > SDK Manager > Android SDK > SDK Tools. Make sure that "Show Package Details" is checked and install the NDK version that is required by the project (currently `27.1.12297006`). ![](../docs/images/android_local_gradle_ndk.png) diff --git a/platform/jvm/capture/build.gradle.kts b/platform/jvm/capture/build.gradle.kts index d2cb98ea..fc180376 100644 --- a/platform/jvm/capture/build.gradle.kts +++ b/platform/jvm/capture/build.gradle.kts @@ -74,7 +74,7 @@ android { checkReleaseBuilds = true } - ndkVersion = "27.0.12077973" + ndkVersion = "27.1.12297006" } // Rust cargo build toolchain diff --git a/tools/android_sdk_wrapper.sh b/tools/android_sdk_wrapper.sh index 12e60266..1dc92f8f 100755 --- a/tools/android_sdk_wrapper.sh +++ b/tools/android_sdk_wrapper.sh @@ -23,7 +23,7 @@ readonly softlink_root_dir="/tmp/bitdrift-android-sdk" readonly softlink_unarchived_dir="$softlink_root_dir/android-sdk-$android_sdk_version-unarchived" readonly cmdline_tools_version="6.0" -readonly ndk_version="27.0.12077973" +readonly ndk_version="27.1.12297006" readonly install_android_cmd_line_tools=( "$android_sdk_unarchived_dir/tools/bin/sdkmanager" "--install" From 31dc5452ca46986aaa9941d5acc1184e088a13cb Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Wed, 11 Sep 2024 18:40:52 -0400 Subject: [PATCH 2/6] force android builds --- ci/check_bazel.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/check_bazel.sh b/ci/check_bazel.sh index af8e5b1b..13bb0b67 100755 --- a/ci/check_bazel.sh +++ b/ci/check_bazel.sh @@ -2,6 +2,8 @@ set -euo pipefail +exit 0 + # Compares the head ref and $GITHUB_BASE_REF (PR branch + target branch, usually main) to # determine which Bazel targets have changed. This is done by analyzing the cache keys and # should be authoritative assuming the builds are hermetic. From d74d7bdc47d5c06267641a1c13623b4d85a5b5ad Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Wed, 11 Sep 2024 18:41:55 -0400 Subject: [PATCH 3/6] more --- ci/check_bazel.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/check_bazel.sh b/ci/check_bazel.sh index 13bb0b67..851661be 100755 --- a/ci/check_bazel.sh +++ b/ci/check_bazel.sh @@ -2,7 +2,8 @@ set -euo pipefail -exit 0 +echo "check_result=0" >> "$GITHUB_OUTPUT" +exit 0 # Changes found # Compares the head ref and $GITHUB_BASE_REF (PR branch + target branch, usually main) to # determine which Bazel targets have changed. This is done by analyzing the cache keys and From a096327d2805a030101c80d3afcd6e7ab433686c Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Wed, 11 Sep 2024 18:55:24 -0400 Subject: [PATCH 4/6] update ubuntu --- .github/workflows/format.yaml | 2 +- .github/workflows/release_gh.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 67bbb495..3d5e4320 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -10,7 +10,7 @@ concurrency: cancel-in-progress: true jobs: format_check: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: # --- Build the project for release diff --git a/.github/workflows/release_gh.yaml b/.github/workflows/release_gh.yaml index 607ecde9..73a8aa4c 100644 --- a/.github/workflows/release_gh.yaml +++ b/.github/workflows/release_gh.yaml @@ -90,7 +90,7 @@ jobs: # Running on ubuntu-latest builds againt a glibc that is more modern than what # instant-android uses in CI, causing a load error. Use 20.04 to link against a compatible # glibc. - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: ["verify-version"] steps: - uses: actions/checkout@v4 From a8e51e512ac19e21223dfe7090668e286ccd6035 Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Wed, 11 Sep 2024 19:00:02 -0400 Subject: [PATCH 5/6] downgrade --- .github/workflows/android.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml index fbe5a5f6..952d9b65 100644 --- a/.github/workflows/android.yaml +++ b/.github/workflows/android.yaml @@ -85,7 +85,7 @@ jobs: path: ./bazel-bin/examples/android/android_app.apk gradle_tests: # Requires a "larger runner", for nested virtualization support - runs-on: ubuntu-latest-8-cores + runs-on: ubuntu-latest env: SKIP_PROTO_GEN: 1 if: needs.pre_check.outputs.should_run == 'true' From 8dc52ac87f13175b8637dc90b6cd06d49c515eca Mon Sep 17 00:00:00 2001 From: Rafal Augustyniak Date: Wed, 11 Sep 2024 19:20:01 -0400 Subject: [PATCH 6/6] remove temporary --- ci/check_bazel.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci/check_bazel.sh b/ci/check_bazel.sh index 851661be..af8e5b1b 100755 --- a/ci/check_bazel.sh +++ b/ci/check_bazel.sh @@ -2,9 +2,6 @@ set -euo pipefail -echo "check_result=0" >> "$GITHUB_OUTPUT" -exit 0 # Changes found - # Compares the head ref and $GITHUB_BASE_REF (PR branch + target branch, usually main) to # determine which Bazel targets have changed. This is done by analyzing the cache keys and # should be authoritative assuming the builds are hermetic.