Add more android targets to CI and release android artifacts (#593)

* more android

Signed-off-by: sagudev <[email protected]>

* release android too

Signed-off-by: sagudev <[email protected]>

* bump to get android releases

Signed-off-by: sagudev <[email protected]>

---------

Signed-off-by: sagudev <[email protected]>

Author: sagudev

.github/workflows/build.yml

@@ -157,6 +157,15 @@ jobs:
 
   android:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          [
+            "armv7-linux-androideabi",
+            "aarch64-linux-android",
+            "x86_64-linux-android",
+          ]
     steps:
       - uses: actions/checkout@v4
       - name: Install NDK
@@ -167,12 +176,22 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          targets: armv7-linux-androideabi
+          targets: ${{ matrix.target }}
       - name: Build
         env:
           ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: |
-          ./android-build cargo build --target="armv7-linux-androideabi"
+          ./android-build cargo build --target="${{ matrix.target }}"
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v1
+        if: ${{ inputs.release }}
+        with:
+          subject-path: "./target/libmozjs-${{ matrix.target }}.tar.gz"
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          path: ./target/libmozjs-${{ matrix.target }}.tar.gz
+          name: libmozjs-${{ matrix.target }}.tar.gz
 
   ohos:
     name: "OpenHarmony"

.github/workflows/release-check.yml

@@ -49,6 +49,50 @@ jobs:
           cargo build --verbose
           cargo test --tests --examples --verbose
 
+  verify-archive-android:
+    name: "Verify archive Android"
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target:
+          [
+            "armv7-linux-androideabi",
+            "aarch64-linux-android",
+            "x86_64-linux-android",
+          ]
+    env:
+      RELEASE_TAG: ${{ github.event_name == 'release' && github.ref_name ||  inputs.release-tag }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install NDK
+        uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r26c
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.target }}
+      - name: Download prebuilt mozjs from artifact
+        if: ${{ env.RELEASE_TAG == '' }}
+        uses: actions/download-artifact@v4
+        with:
+          name: libmozjs-${{ matrix.target }}.tar.gz
+      - name: Build from archive
+        if: ${{ env.RELEASE_TAG == '' }}
+        env:
+          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
+          MOZJS_ARCHIVE: libmozjs-${{ matrix.target }}.tar.gz
+        run: |
+          ./android-build cargo build --target="${{ matrix.target }}" --verbose
+      - name: Build from auto-download (arch ${{ matrix.target }})
+        if: ${{ env.RELEASE_TAG != '' }}
+        env:
+          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
+          MOZJS_ATTESTATION: strict
+        run: |
+          ./android-build cargo build --target="${{ matrix.target }}" --verbose
+
   verify-archive-ohos:
     name: "Verify archive OpenHarmony"
     runs-on: ubuntu-latest

mozjs-sys/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mozjs_sys"
 description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
 repository.workspace = true
-version = "0.128.13-0"
+version = "0.128.13-1"
 authors = ["Mozilla"]
 links = "mozjs"
 license.workspace = true