From 52d6944e1129b7846be1d408bf78f6b20cc93f59 Mon Sep 17 00:00:00 2001 From: Osei Fortune Date: Fri, 26 Jan 2024 20:36:55 -0400 Subject: [PATCH 1/5] chore: bump ndk version --- test-app/runtime/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-app/runtime/build.gradle b/test-app/runtime/build.gradle index e92b16055..f336cb1e7 100644 --- a/test-app/runtime/build.gradle +++ b/test-app/runtime/build.gradle @@ -67,7 +67,7 @@ android { if (hasNdkVersion) { ndkVersion ndkVersion } else { - ndkVersion "21.1.6352462" + ndkVersion "23.2.8568313" // ndkVersion "22.1.7171670" } From 87de764eec47c58cd432d9739c9f3251dfeba576 Mon Sep 17 00:00:00 2001 From: Osei Fortune Date: Fri, 26 Jan 2024 21:40:37 -0400 Subject: [PATCH 2/5] chore: bump workflow ndk --- .github/workflows/npm_release.yml | 2 +- .github/workflows/pull_request.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/npm_release.yml b/.github/workflows/npm_release.yml index 9f4da2a86..8d3a08901 100644 --- a/.github/workflows/npm_release.yml +++ b/.github/workflows/npm_release.yml @@ -8,7 +8,7 @@ on: env: NPM_TAG: "next" EMULATOR_NAME: "runtime-emu" - NDK_VERSION: r21b + NDK_VERSION: r23c ANDROID_API: 29 ANDROID_ABI: x86_64 NDK_ARCH: darwin-x86_64 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index a2c844c83..e9d67ee93 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -4,7 +4,7 @@ on: env: NPM_TAG: "pr" EMULATOR_NAME: "runtime-emu" - NDK_VERSION: r21b + NDK_VERSION: r23c ANDROID_API: 29 ANDROID_ABI: x86_64 NDK_ARCH: darwin-x86_64 From f4a1bff3580d92d798496fbd70103db8883478ca Mon Sep 17 00:00:00 2001 From: Osei Fortune Date: Fri, 26 Jan 2024 21:57:21 -0400 Subject: [PATCH 3/5] fix: ndk download path --- .github/workflows/npm_release.yml | 4 ++-- .github/workflows/pull_request.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/npm_release.yml b/.github/workflows/npm_release.yml index 8d3a08901..24af2b37b 100644 --- a/.github/workflows/npm_release.yml +++ b/.github/workflows/npm_release.yml @@ -42,7 +42,7 @@ jobs: - name: Setup NDK run: | echo "y" | sdkmanager "cmake;3.6.4111459" - wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-$NDK_ARCH.zip + wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-darwin.zip chmod +x android-ndk-$NDK_VERSION-$NDK_ARCH.zip unzip -q android-ndk-$NDK_VERSION-$NDK_ARCH.zip rm -rf android-ndk-$NDK_VERSION-$NDK_ARCH.zip @@ -102,7 +102,7 @@ jobs: - name: Setup NDK run: | echo "y" | sdkmanager "cmake;3.6.4111459" - wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-$NDK_ARCH.zip + wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-darwin.zip chmod +x android-ndk-$NDK_VERSION-$NDK_ARCH.zip unzip -q android-ndk-$NDK_VERSION-$NDK_ARCH.zip rm -rf android-ndk-$NDK_VERSION-$NDK_ARCH.zip diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e9d67ee93..9fdc20407 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -39,7 +39,7 @@ jobs: - name: Setup NDK run: | echo "y" | sdkmanager "cmake;3.6.4111459" - wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-$NDK_ARCH.zip + wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-darwin.zip chmod +x android-ndk-$NDK_VERSION-$NDK_ARCH.zip unzip -q android-ndk-$NDK_VERSION-$NDK_ARCH.zip rm -rf android-ndk-$NDK_VERSION-$NDK_ARCH.zip @@ -99,7 +99,7 @@ jobs: - name: Setup NDK run: | echo "y" | sdkmanager "cmake;3.6.4111459" - wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-$NDK_ARCH.zip + wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-darwin.zip chmod +x android-ndk-$NDK_VERSION-$NDK_ARCH.zip unzip -q android-ndk-$NDK_VERSION-$NDK_ARCH.zip rm -rf android-ndk-$NDK_VERSION-$NDK_ARCH.zip From 28e7b9ce30fdffc96a19aa29eb39cb9837429a6d Mon Sep 17 00:00:00 2001 From: Osei Fortune Date: Fri, 26 Jan 2024 22:04:22 -0400 Subject: [PATCH 4/5] fix: ndk zip name --- .github/workflows/npm_release.yml | 12 ++++++------ .github/workflows/pull_request.yml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/npm_release.yml b/.github/workflows/npm_release.yml index 24af2b37b..9da182461 100644 --- a/.github/workflows/npm_release.yml +++ b/.github/workflows/npm_release.yml @@ -43,9 +43,9 @@ jobs: run: | echo "y" | sdkmanager "cmake;3.6.4111459" wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-darwin.zip - chmod +x android-ndk-$NDK_VERSION-$NDK_ARCH.zip - unzip -q android-ndk-$NDK_VERSION-$NDK_ARCH.zip - rm -rf android-ndk-$NDK_VERSION-$NDK_ARCH.zip + chmod +x android-ndk-$NDK_VERSION-darwin.zip + unzip -q android-ndk-$NDK_VERSION-darwin.zip + rm -rf android-ndk-$NDK_VERSION-darwin.zip export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION echo ANDROID_NDK_HOME=${ANDROID_NDK_HOME} >> $GITHUB_ENV echo ANDROID_NDK=${ANDROID_NDK_HOME} >> $GITHUB_ENV @@ -103,9 +103,9 @@ jobs: run: | echo "y" | sdkmanager "cmake;3.6.4111459" wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-darwin.zip - chmod +x android-ndk-$NDK_VERSION-$NDK_ARCH.zip - unzip -q android-ndk-$NDK_VERSION-$NDK_ARCH.zip - rm -rf android-ndk-$NDK_VERSION-$NDK_ARCH.zip + chmod +x android-ndk-$NDK_VERSION-darwin.zip + unzip -q android-ndk-$NDK_VERSION-darwin.zip + rm -rf android-ndk-$NDK_VERSION-darwin.zip export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION echo ANDROID_NDK_HOME=${ANDROID_NDK_HOME} >> $GITHUB_ENV echo ANDROID_NDK=${ANDROID_NDK_HOME} >> $GITHUB_ENV diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 9fdc20407..0db981a91 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -40,9 +40,9 @@ jobs: run: | echo "y" | sdkmanager "cmake;3.6.4111459" wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-darwin.zip - chmod +x android-ndk-$NDK_VERSION-$NDK_ARCH.zip - unzip -q android-ndk-$NDK_VERSION-$NDK_ARCH.zip - rm -rf android-ndk-$NDK_VERSION-$NDK_ARCH.zip + chmod +x android-ndk-$NDK_VERSION-darwin.zip + unzip -q android-ndk-$NDK_VERSION-darwin.zip + rm -rf android-ndk-$NDK_VERSION-darwin.zip export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION echo ANDROID_NDK_HOME=${ANDROID_NDK_HOME} >> $GITHUB_ENV echo ANDROID_NDK=${ANDROID_NDK_HOME} >> $GITHUB_ENV @@ -100,9 +100,9 @@ jobs: run: | echo "y" | sdkmanager "cmake;3.6.4111459" wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-darwin.zip - chmod +x android-ndk-$NDK_VERSION-$NDK_ARCH.zip - unzip -q android-ndk-$NDK_VERSION-$NDK_ARCH.zip - rm -rf android-ndk-$NDK_VERSION-$NDK_ARCH.zip + chmod +x android-ndk-$NDK_VERSION-darwin.zip + unzip -q android-ndk-$NDK_VERSION-darwin.zip + rm -rf android-ndk-$NDK_VERSION-darwin.zip export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION echo ANDROID_NDK_HOME=${ANDROID_NDK_HOME} >> $GITHUB_ENV echo ANDROID_NDK=${ANDROID_NDK_HOME} >> $GITHUB_ENV From 9ce8aac3e4cc0ced22d01be574f32c5749edfb55 Mon Sep 17 00:00:00 2001 From: Osei Fortune Date: Fri, 26 Jan 2024 22:44:33 -0400 Subject: [PATCH 5/5] fix: replace hardcoded arch --- .github/workflows/npm_release.yml | 18 +++++++++--------- .github/workflows/pull_request.yml | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/npm_release.yml b/.github/workflows/npm_release.yml index 9da182461..ffc4384f9 100644 --- a/.github/workflows/npm_release.yml +++ b/.github/workflows/npm_release.yml @@ -11,7 +11,7 @@ env: NDK_VERSION: r23c ANDROID_API: 29 ANDROID_ABI: x86_64 - NDK_ARCH: darwin-x86_64 + NDK_ARCH: darwin jobs: build: @@ -42,10 +42,10 @@ jobs: - name: Setup NDK run: | echo "y" | sdkmanager "cmake;3.6.4111459" - wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-darwin.zip - chmod +x android-ndk-$NDK_VERSION-darwin.zip - unzip -q android-ndk-$NDK_VERSION-darwin.zip - rm -rf android-ndk-$NDK_VERSION-darwin.zip + wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-$NDK_ARCH.zip + chmod +x android-ndk-$NDK_VERSION-$NDK_ARCH.zip + unzip -q android-ndk-$NDK_VERSION-$NDK_ARCH.zip + rm -rf android-ndk-$NDK_VERSION-$NDK_ARCH.zip export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION echo ANDROID_NDK_HOME=${ANDROID_NDK_HOME} >> $GITHUB_ENV echo ANDROID_NDK=${ANDROID_NDK_HOME} >> $GITHUB_ENV @@ -102,10 +102,10 @@ jobs: - name: Setup NDK run: | echo "y" | sdkmanager "cmake;3.6.4111459" - wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-darwin.zip - chmod +x android-ndk-$NDK_VERSION-darwin.zip - unzip -q android-ndk-$NDK_VERSION-darwin.zip - rm -rf android-ndk-$NDK_VERSION-darwin.zip + wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-$NDK_ARCH.zip + chmod +x android-ndk-$NDK_VERSION-$NDK_ARCH.zip + unzip -q android-ndk-$NDK_VERSION-$NDK_ARCH.zip + rm -rf android-ndk-$NDK_VERSION-$NDK_ARCH.zip export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION echo ANDROID_NDK_HOME=${ANDROID_NDK_HOME} >> $GITHUB_ENV echo ANDROID_NDK=${ANDROID_NDK_HOME} >> $GITHUB_ENV diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 0db981a91..c7056bcab 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -7,7 +7,7 @@ env: NDK_VERSION: r23c ANDROID_API: 29 ANDROID_ABI: x86_64 - NDK_ARCH: darwin-x86_64 + NDK_ARCH: darwin jobs: @@ -39,10 +39,10 @@ jobs: - name: Setup NDK run: | echo "y" | sdkmanager "cmake;3.6.4111459" - wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-darwin.zip - chmod +x android-ndk-$NDK_VERSION-darwin.zip - unzip -q android-ndk-$NDK_VERSION-darwin.zip - rm -rf android-ndk-$NDK_VERSION-darwin.zip + wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-$NDK_ARCH.zip + chmod +x android-ndk-$NDK_VERSION-$NDK_ARCH.zip + unzip -q android-ndk-$NDK_VERSION-$NDK_ARCH.zip + rm -rf android-ndk-$NDK_VERSION-$NDK_ARCH.zip export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION echo ANDROID_NDK_HOME=${ANDROID_NDK_HOME} >> $GITHUB_ENV echo ANDROID_NDK=${ANDROID_NDK_HOME} >> $GITHUB_ENV @@ -99,10 +99,10 @@ jobs: - name: Setup NDK run: | echo "y" | sdkmanager "cmake;3.6.4111459" - wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-darwin.zip - chmod +x android-ndk-$NDK_VERSION-darwin.zip - unzip -q android-ndk-$NDK_VERSION-darwin.zip - rm -rf android-ndk-$NDK_VERSION-darwin.zip + wget https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-$NDK_ARCH.zip + chmod +x android-ndk-$NDK_VERSION-$NDK_ARCH.zip + unzip -q android-ndk-$NDK_VERSION-$NDK_ARCH.zip + rm -rf android-ndk-$NDK_VERSION-$NDK_ARCH.zip export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION echo ANDROID_NDK_HOME=${ANDROID_NDK_HOME} >> $GITHUB_ENV echo ANDROID_NDK=${ANDROID_NDK_HOME} >> $GITHUB_ENV