Run PR CI on Android

rust-lang · Mar 11, 2024 · 3298004 · 3298004
1 parent 93f2f2c
commit 3298004
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,22 +48,14 @@ jobs:
       TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
       CACHE_DOMAIN: ci-caches.rust-lang.org
     if: "github.event_name == 'pull_request'"
-    continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}"
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            os: ubuntu-20.04-4core-16gb
-            env: {}
-          - name: mingw-check-tidy
-            os: ubuntu-20.04-4core-16gb
+          - name: arm-android
+            os: ubuntu-20.04-8core-32gb
             env: {}
-          - name: x86_64-gnu-llvm-16
-            env:
-              ENABLE_GCC_CODEGEN: "1"
-            os: ubuntu-20.04-16core-64gb
-          - name: x86_64-gnu-tools
-            os: ubuntu-20.04-16core-64gb
+          - name: dist-android
+            os: ubuntu-20.04-8core-32gb
             env: {}
     defaults:
       run:

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
@@ -347,23 +347,14 @@ jobs:
       <<: [*shared-ci-variables, *public-variables]
       PR_CI_JOB: 1
     if: github.event_name == 'pull_request'
-    continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            <<: *job-linux-4c
-
-          - name: mingw-check-tidy
-            <<: *job-linux-4c
-
-          - name: x86_64-gnu-llvm-16
-            env:
-              ENABLE_GCC_CODEGEN: "1"
-            <<: *job-linux-16c
+          - name: arm-android
+            <<: *job-linux-8c
 
-          - name: x86_64-gnu-tools
-            <<: *job-linux-16c
+          - name: dist-android
+            <<: *job-linux-8c
 
   auto:
     <<: *base-ci-job