From 8a5d92e3da1c410765213a5796fc0bd9bbd953be Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Fri, 3 Jan 2025 15:29:30 +0100 Subject: [PATCH 1/3] CI: Remove `libgcc.a` linker workaround from repackaged NDK [Rust 1.68 is now targeting NDK r25] instead of r17 and no longer tries to forcibly link against `libgcc.a`, which was removed since NDK r23 in favour of [only needing to link against `libunwind`]. Since this Rust release is over 1.5 years old, assume everyone is using at least 1.68 and drop the workaround from our repackaged NDK release. [Rust 1.68 is now targeting NDK r25]: https://blog.rust-lang.org/2023/03/09/Rust-1.68.0.html#other-changes [only needing to link against `libunwind`]: https://blog.rust-lang.org/2023/01/09/android-ndk-update-r25.html --- .github/workflows/sdk.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml index 55085aca..fc52dc0c 100644 --- a/.github/workflows/sdk.yml +++ b/.github/workflows/sdk.yml @@ -23,11 +23,6 @@ jobs: - run: cp -r $CLANG/lib/linux/x86_64/* Android.ndk/usr/lib/x86_64-linux-android/ - run: cp -r $CLANG/lib/linux/i386/* Android.ndk/usr/lib/i686-linux-android/ - - run: echo "INPUT(-lunwind)" > Android.ndk/usr/lib/aarch64-linux-android/libgcc.a - - run: echo "INPUT(-lunwind)" > Android.ndk/usr/lib/arm-linux-androideabi/libgcc.a - - run: echo "INPUT(-lunwind)" > Android.ndk/usr/lib/x86_64-linux-android/libgcc.a - - run: echo "INPUT(-lunwind)" > Android.ndk/usr/lib/i686-linux-android/libgcc.a - - run: tar --zstd -cf Android.ndk.tar.zst Android.ndk - run: gh release upload $TAG Android.ndk.tar.zst -R ${{ github.repository }} env: From 589ed5a57a1d3474bd1bf968be99fce7a785c79a Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Fri, 3 Jan 2025 17:47:53 +0100 Subject: [PATCH 2/3] Prepare 0.2.1 release --- .github/workflows/sdk.yml | 4 ++-- xbuild/src/download.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml index fc52dc0c..f6f650f3 100644 --- a/.github/workflows/sdk.yml +++ b/.github/workflows/sdk.yml @@ -10,8 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - run: echo "TOOLCHAIN=$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64" >> $GITHUB_ENV - - run: ls $TOOLCHAIN/lib64/clang | xargs -0 printf "CLANG_VERSION=%s" >> $GITHUB_ENV - - run: echo "CLANG=$TOOLCHAIN/lib64/clang/$CLANG_VERSION" >> $GITHUB_ENV + - run: ls $TOOLCHAIN/lib/clang | xargs -0 printf "CLANG_VERSION=%s" >> $GITHUB_ENV + - run: echo "CLANG=$TOOLCHAIN/lib/clang/$CLANG_VERSION" >> $GITHUB_ENV - run: echo $ANDROID_NDK_LATEST_HOME - run: echo $CLANG_VERSION diff --git a/xbuild/src/download.rs b/xbuild/src/download.rs index 6cf31bd1..62f9a334 100644 --- a/xbuild/src/download.rs +++ b/xbuild/src/download.rs @@ -193,7 +193,7 @@ impl WorkItem { impl WorkItem { const ORG: &'static str = "rust-mobile"; const REPO: &'static str = "xbuild"; - const VERSION: &'static str = "v0.1.0+3"; + const VERSION: &'static str = "v0.2.1-alpha"; pub fn xbuild_release(output: PathBuf, artifact: &str) -> Self { Self::github_release(output, Self::ORG, Self::REPO, Self::VERSION, artifact) From 417edd21851bb6d993db9870b4668b21b75adddd Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Mon, 6 Jan 2025 10:50:11 +0100 Subject: [PATCH 3/3] Switch from removed `macos-11` runners to `macos-latest` with Xcode 16.1 The `macos-11` runners are no longer hosted by GitHub as this OS version is too old. Likewise Xcode 13.2.1 is no longer available, the lowest supported version appears to be `15.0`. --- .github/workflows/sdk.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml index f6f650f3..fcaabac3 100644 --- a/.github/workflows/sdk.yml +++ b/.github/workflows/sdk.yml @@ -30,12 +30,12 @@ jobs: TAG: ${{ github.event.release.tag_name }} macos: - runs-on: macos-11 + runs-on: macos-latest steps: - run: ls /Applications/Xcode* - run: cp -R $SDK_PATH . env: - SDK_PATH: /Applications/Xcode_13.2.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk + SDK_PATH: /Applications/Xcode_16.1.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk - run: gtar --zstd -cf MacOSX.sdk.tar.zst MacOSX.sdk - run: gh release upload $TAG MacOSX.sdk.tar.zst -R ${{ github.repository }} env: @@ -43,12 +43,12 @@ jobs: TAG: ${{ github.event.release.tag_name }} ios: - runs-on: macos-11 + runs-on: macos-latest steps: - run: ls /Applications/Xcode* - run: cp -R $SDK_PATH . env: - SDK_PATH: /Applications/Xcode_13.2.1.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk + SDK_PATH: /Applications/Xcode_16.1.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk - run: gtar --zstd -cf iPhoneOS.sdk.tar.zst iPhoneOS.sdk - run: gh release upload $TAG iPhoneOS.sdk.tar.zst -R ${{ github.repository }} env: