ci: use self-hosted runner for ARM

- We now have a self-hosted runner to continuously test rsonpath on ARM64!
rsonquery · Jan 9, 2024 · 4811f10 · 4811f10
1 parent 97b53a8
commit 4811f10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -57,11 +57,9 @@ jobs:
           - x86_64-pc-windows-msvc
           - x86_64-unknown-linux-gnu
         include:
-          - os: ubuntu-latest
+          - os: [self-hosted, linux, ARM64]
             target_triple: aarch64-unknown-linux-gnu
-            # This target needs special setup.
-            prologue-script: sudo apt update && sudo apt install gcc-aarch64-linux-gnu
-            rustflags: "--deny warnings"
+            rustflags: "-C link-arg=-fuse-ld=lld --deny warnings"
           - os: ubuntu-latest
             target_triple: i686-unknown-linux-gnu
             # This target needs special setup.

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -13,7 +13,6 @@ permissions:
 env:
   CARGO_TERM_COLOR: always
   RUST_BACKTRACE: 1
-  CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: "aarch64-linux-gnu-gcc"
   CARGO_PROFILE_DEV_BUILD_OVERRIDE_DEBUG: "true"
 
 jobs:
@@ -40,52 +39,40 @@ jobs:
           - x86_64-pc-windows-msvc
           - x86_64-unknown-linux-gnu
         include:
-          - os: ubuntu-latest
+          - os: [self-hosted, linux, ARM64]
             target_triple:
               aarch64-unknown-linux-gnu
-            # This target needs special setup.
-            prologue-script:
-              sudo apt update && sudo apt install gcc-aarch64-linux-gnu
-            # There is no standard GitHub os image that can execute ARM, we just build it.
-            can-run: false
-            rustflags: "--deny warnings"
+            rustflags: "-C link-arg=-fuse-ld=lld --deny warnings"
           - os: windows-latest
             target_triple:
               i686-pc-windows-gnu
             # This target needs special setup with MinGW.
             needs-mingw: x86
-            can-run: true
             # lld on Windows uses extreme amounts of memory for debuginfo=2
             rustflags: "-C link-arg=-fuse-ld=lld -C debuginfo=1 --deny warnings"
           - os: windows-latest
             target_triple: i686-pc-windows-msvc
-            can-run: true
             # lld on Windows uses extreme amounts of memory for debuginfo=2
             rustflags: "-C link-arg=-fuse-ld=lld -C debuginfo=1 --deny warnings"
           - os: ubuntu-latest
             target_triple:
               i686-unknown-linux-gnu
             # This target needs special setup.
             prologue-script: sudo apt update && sudo apt install gcc-multilib
-            can-run: true
             rustflags: "-C link-arg=-fuse-ld=lld --deny warnings"
           - os: macos-latest
             target_triple: x86_64-apple-darwin
-            can-run: true
             rustflags: "--deny warnings"
           - os: windows-latest
             target_triple: x86_64-pc-windows-gnu
-            can-run: true
             # lld on Windows uses extreme amounts of memory for debuginfo=2
             rustflags: "-C link-arg=-fuse-ld=lld -C debuginfo=1 --deny warnings"
           - os: windows-latest
             target_triple: x86_64-pc-windows-msvc
-            can-run: true
             # lld on Windows uses extreme amounts of memory for debuginfo=2
             rustflags: "-C link-arg=-fuse-ld=lld -C debuginfo=1 --deny warnings"
           - os: ubuntu-latest
             target_triple: x86_64-unknown-linux-gnu
-            can-run: true
             rustflags: "-C link-arg=-fuse-ld=lld --deny warnings"
     steps:
       - name: Harden Runner
@@ -165,7 +152,6 @@ jobs:
           name: ${{ needs.test-gen.outputs.artifact-name }}
           path: ${{ needs.test-gen.outputs.artifact-path }}
       - name: Test all feature sets
-        if: matrix.can-run
         run: cargo hack test --workspace --feature-powerset --skip default --target ${{ matrix.target_triple }} --features arbitrary --ignore-unknown-features
         env:
           RUSTFLAGS: ${{ matrix.rustflags }}