More cross fixes.

Alexhuszagh · Sep 9, 2024 · 1241602 · 1241602
1 parent a3ce796
commit 1241602
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/.github/workflows/Cross.yml b/.github/workflows/Cross.yml
@@ -26,10 +26,6 @@ jobs:
           - armv7-unknown-linux-gnueabihf
           - i686-unknown-linux-gnu
           - i686-unknown-linux-musl
-          #- mips-unknown-linux-gnu
-          #- mips64-unknown-linux-gnuabi64
-          #- mips64el-unknown-linux-gnuabi64
-          #- mipsel-unknown-linux-gnu
           # NOTE: This fails on cross v0.2.1, which is unusual since
           # manually invoking the failing tests with qemu-5.1.0 passes.
           #- powerpc64le-unknown-linux-gnu
@@ -44,13 +40,17 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.65.0
+          toolchain: stable
           target: ${{matrix.target}}
+      - name: Install Cross
+        run: |
+          cargo install cross@0.2.5
+          rustup toolchain add 1.63.0
       - uses: actions-rs/cargo@v1
         with:
           use-cross: true
           command: check
-          args: --target ${{matrix.target}}
+          args: +1.63.0 --target ${{matrix.target}}
       - uses: actions-rs/cargo@v1
         with:
           use-cross: true
@@ -78,14 +78,26 @@ jobs:
           - x86_64-unknown-freebsd
           - x86_64-unknown-netbsd
 
+          # MIPS
+          # These targets have been removed from Tier 2
+          # support, so we're using an older compiler and
+          # just checking they can be checked.
+          - mips-unknown-linux-gnu
+          - mips64-unknown-linux-gnuabi64
+          - mips64el-unknown-linux-gnuabi64
+          - mipsel-unknown-linux-gnu
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.65.0
+          toolchain: stable
           target: ${{matrix.target}}
+      - name: Install Cross
+        run: |
+          cargo install cross@0.2.5
+          rustup toolchain add 1.63.0
       - uses: actions-rs/cargo@v1
         with:
           use-cross: true
           command: check
-          args: --target ${{matrix.target}}
+          args: +1.63.0 --target ${{matrix.target}}
diff --git a/.github/workflows/OSX.yml b/.github/workflows/OSX.yml
@@ -5,33 +5,20 @@ on:
 
 jobs:
   cross:
-    name: Rust ${{matrix.target}}
+    name: Rust MacOS
     runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        target:
-          # iOS targets don't work, since rust-embedded doesn't provide images.
-          - x86_64-apple-darwin
-
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
-          target: ${{matrix.target}}
       - uses: actions-rs/cargo@v1
         with:
-          use-cross: true
           command: check
-          args: --target ${{matrix.target}}
       - uses: actions-rs/cargo@v1
         with:
-          use-cross: true
           command: test
-          args: --target ${{matrix.target}}
       - uses: actions-rs/cargo@v1
         with:
-          use-cross: true
           command: test
-          args: --target ${{matrix.target}} --features=radix,format,compact
+          args: --features=radix,format,compact