feat(build): align bootstrap builds with Termux NDK r29 (16 KB)

.github/workflows/build-bootstraps.yml

@@ -26,20 +26,21 @@ jobs:
           sudo apt-get install -y autopoint
 
       - name: Clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           fetch-depth: 1
 
       - name: Get packages from termux-packages
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           path: termux-packages
           repository: termux/termux-packages
-          ref: 'acf1df1e90034ce0100ac54726ae56792bf56859'
+          ref: "23d530425344010b73b0392ab66b041e8f65e34b"
 
       - name: Setup java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v5
         with:
+          distribution: temurin
           java-version: 17
 
       - name: Setup environment
@@ -48,22 +49,27 @@ jobs:
           sudo chown $USER:$USER /data
           mv *.sh termux-packages/scripts/
           mv termux-packages/* .
+          patch -p1 < patches/properties.patch
           for package in patches/*; do
-            cp -r $package packages;
+            [ -d "$package" ] || continue
+            cp -r "$package" packages
           done
           find packages/git -type f -name "*subpackage*" -exec rm {} +
           find packages/libxml2 -type f -name "*python*" -exec rm {} +
+          find packages/ruby -type f \( -name 'process.c.patch' -o -name 'yjit-src-*.patch' -o -name 'lib-rubygems-install_update_options.rb.patch' \) -exec rm {} +
           sudo mkdir -p /home/builder && mv ./* /home/builder
 
       - name: Create bootstrap archive
         working-directory: /home/builder
+        env:
+          TERMUX_JAVA_HOME: ${{ env.JAVA_HOME }}
         run: |
           ./clean.sh
           ./scripts/setup-android-sdk.sh
           ./scripts/build-bootstraps.sh --android10 --architectures ${{ matrix.target_arch }}
 
       - name: Store bootstrap
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ruby-${{ matrix.target_arch }}
           path: "/home/builder/*.zip"
@@ -74,12 +80,12 @@ jobs:
     if: github.ref == 'refs/heads/main' && github.event.inputs.release == 'true' && startsWith(github.event.inputs.tag, 'v')
     steps:
       - name: Clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
       - name: Fetch bootstrap archives
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           path: ./
           merge-multiple: true
@@ -90,7 +96,7 @@ jobs:
           git push --tags
 
       - name: Publish bootstrap zips to GitHub release
-        uses: termux/upload-release-action@v4.1.0
+        uses: termux/upload-release-action@v5.0.0
         with:
           file: "*.zip"
           file_glob: true
@@ -103,19 +109,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           fetch-depth: 1
 
       - name: Fetch bootstrap archives
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           merge-multiple: true
           path: ./
 
       - name: Setup java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v5
         with:
+          distribution: temurin
           java-version: 17
 
       - name: Build apk
@@ -126,7 +133,7 @@ jobs:
           ./gradlew assembleDebug
 
       - name: Store generated APK file
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: termux-app
           path: ./termux-app/app/build/outputs/apk/debug/*.apk