more CI fix

.github/workflows/android.yml

@@ -6,12 +6,6 @@ on:
         required: false
         default: false
         type: boolean
-      wpt:
-        required: false
-        type: string
-      layout:
-        required: false
-        type: string
       unit-tests:
         required: false
         default: false
@@ -29,15 +23,6 @@ on:
         required: false
         default: false
         type: boolean
-      wpt:
-        default: "test"
-        required: false
-        type: choice
-        options: ["test", "sync"]
-      layout:
-        required: false
-        type: choice
-        options: ["none", "2013", "2020", "all"]
       unit-tests:
         required: false
         default: false
@@ -65,6 +50,9 @@ jobs:
   build:
     name: Android Build
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        arch: ['armv7-linux-androideabi', 'i686-linux-android']
     steps:
       - uses: actions/checkout@v3
         if: github.event_name != 'issue_comment' && github.event_name != 'pull_request_target'
@@ -79,10 +67,6 @@ jobs:
           fetch-depth: 2
       - name: Run sccache-cache
         uses: mozilla-actions/[email protected]
-      - name: Select Python 3.9
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
       - name: Install taplo
         uses: baptiste0928/cargo-install@v2
         with:
@@ -94,10 +78,10 @@ jobs:
         run: sudo apt update && python3 ./mach bootstrap
       # - name: Tidy
       #   run: python3 ./mach test-tidy --no-progress --all
-      - name: Release build (${{ inputs.production && 'without' || 'with' }} debug assertions)
+      - name: Release build (${{ matrix.arch }} ${{ inputs.production && 'without' || 'with' }} debug assertions)
         run: |
           export JAVA_HOME="${JAVA_HOME_17_X64}"
-          python3 ./mach build --android ${cargo_profile_option}
+          python3 ./mach build --android --target ${{ matrix.arch }} ${cargo_profile_option}
       # - name: Smoketest
       #   run: xvfb-run python3 ./mach smoketest ${cargo_profile_option}
       - name: Script tests
@@ -115,30 +99,11 @@ jobs:
           path: target/cargo-timings-*
       # - name: Lockfile check
       #   run: ./etc/ci/lockfile_changed.sh
-      # - name: Build mach package
-      #   run: python3 ./mach package --android ${cargo_profile_option}
-      - name: Upload artifact for mach package
+      - name: Upload APK artifact for mach package
         uses: actions/upload-artifact@v3
         with:
-          name: android
-          path: target/android/armv7-linux-androideabi/${{ env.cargo_profile_name }}/servoapp.apk
-      # - name: Upload nightly
-      #   if: ${{ inputs.upload }}
-      #   run: |
-      #     python3 ./mach upload-nightly linux \
-      #       --secret-from-environment \
-      #       --github-release-id ${{ inputs.github-release-id }}
-      #   env:
-      #     S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}
-      #     NIGHTLY_REPO_TOKEN: ${{ secrets.NIGHTLY_REPO_TOKEN }}
-      #     NIGHTLY_REPO: ${{ github.repository_owner }}/servo-nightly-builds
-      # - name: Build package for target
-      #   run: tar -czf target.tar.gz target/${cargo_profile_name}/servo resources
-      # - name: Upload artifact for target
-      #   uses: actions/upload-artifact@v3
-      #   with:
-      #     name: release-binary
-      #     path: target.tar.gz
+          name: android-${{ matrix.arch }}-${{ env.cargo_profile_name }}
+          path: target/android/${{ matrix.arch }}/${{ env.cargo_profile_name }}/servoapp.apk
 
   result:
     name: Result