try

rust-lang · Dec 31, 2022 · fcc7c55 · fcc7c55
1 parent e41d603
commit fcc7c55
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -598,9 +598,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: dist-x86_64-linux
-            os: ubuntu-20.04-xl
-            env: {}
+          - name: aarch64-gnu
+            os:
+              - self-hosted
+              - ARM64
+              - linux
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
     steps:

diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
@@ -759,9 +759,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - &dist-x86_64-linux
-            name: dist-x86_64-linux
-            <<: *job-linux-xl
+          - name: aarch64-gnu
+            <<: *job-aarch64-linux
 
   master:
     name: master

diff --git a/src/tools/tidy/src/no_merge.rs b/src/tools/tidy/src/no_merge.rs
@@ -48,7 +48,7 @@ fn find_merge_commits(remote: &str) -> Result<String, String> {
         "--format=%s",
         &format!("{remote}/master..HEAD"),
         // Ignore subtree syncs. Add your new subtrees here.
-        ":!src/tools/miri",
+        //   ":!src/tools/miri", // Ignore miri to see whether its the only thing missing or whatevers going on
         ":!src/tools/rust-analyzer",
         ":!compiler/rustc_smir",
         ":!library/portable-simd",