ci: mirror targets for rustic in cross-ci and try to fix build (#370)

Signed-off-by: simonsan <14062932+simonsan@users.noreply.github.com>
rustic-rs · Nov 27, 2024 · 75faf1f · 75faf1f
1 parent 2d0bbd5
commit 75faf1f
Show file tree

Hide file tree

Showing 3 changed files with 128 additions and 105 deletions.
diff --git a/.github/workflows/ci-heavy.yml b/.github/workflows/ci-heavy.yml
@@ -162,7 +162,7 @@ jobs:
     # Only run if the commit doesn't come from a merged PR, we assume CI is running in the PR as well
     # so we don't want to have runs double up
     if: github.event.pull_request.merged == false
-    name: Cross checking ${{ matrix.job.target }}
+    name: Cross checking ${{ matrix.job.target }} on ${{ matrix.rust }}
     runs-on: ${{ matrix.job.os }}
     strategy:
       fail-fast: false

diff --git a/.github/workflows/cross-ci.yml b/.github/workflows/cross-ci.yml
@@ -16,7 +16,7 @@ jobs:
     # Only run if the commit doesn't come from a merged PR, we assume CI is running in the PR as well
     # so we don't want to have runs double up
     if: github.event.pull_request.merged == false
-    name: Cross checking ${{ matrix.job.target }}
+    name: Cross checking ${{ matrix.job.target }} on ${{ matrix.rust }}
     runs-on: ${{ matrix.job.os }}
     strategy:
       fail-fast: false
@@ -28,12 +28,11 @@ jobs:
             target: x86_64-pc-windows-msvc
             architecture: x86_64
             use-cross: false
-          # FIXME: `aws-lc-sys` doesn't cross compile
-          # - os: ubuntu-latest
-          #   os-name: windows
-          #   target: x86_64-pc-windows-gnu
-          #   architecture: x86_64
-          #   use-cross: true
+          - os: windows-latest
+            os-name: windows
+            target: x86_64-pc-windows-gnu
+            architecture: x86_64
+            use-cross: false
           - os: macos-13
             os-name: macos
             target: x86_64-apple-darwin
@@ -43,7 +42,7 @@ jobs:
             os-name: macos
             target: aarch64-apple-darwin
             architecture: arm64
-            use-cross: false
+            use-cross: true
           - os: ubuntu-latest
             os-name: linux
             target: x86_64-unknown-linux-gnu
@@ -54,6 +53,31 @@ jobs:
             target: x86_64-unknown-linux-musl
             architecture: x86_64
             use-cross: false
+          - os: ubuntu-latest
+            os-name: linux
+            target: aarch64-unknown-linux-gnu
+            architecture: arm64
+            use-cross: true
+          - os: ubuntu-latest
+            os-name: linux
+            target: aarch64-unknown-linux-musl
+            architecture: arm64
+            use-cross: true
+          - os: ubuntu-latest
+            os-name: linux
+            target: i686-unknown-linux-gnu
+            architecture: i686
+            use-cross: true
+          - os: ubuntu-latest
+            os-name: netbsd
+            target: x86_64-unknown-netbsd
+            architecture: x86_64
+            use-cross: true
+          - os: ubuntu-latest
+            os-name: linux
+            target: armv7-unknown-linux-gnueabihf
+            architecture: armv7
+            use-cross: true
 
     steps:
       - name: Checkout repository