build: remove ci/cd support for i686-unknown-linux-gnu, armv7-unknown…

…-linux-gnueabihf, x86_64-unknown-netbsd Signed-off-by: simonsan <[email protected]>
rustic-rs · Nov 29, 2024 · a1fd2c9 · a1fd2c9
1 parent 6779470
commit a1fd2c9
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 135 deletions.
diff --git a/.github/workflows/cross-ci.yml b/.github/workflows/cross-ci.yml
@@ -71,21 +71,16 @@ jobs:
             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
+          # - os: ubuntu-latest
+          #   os-name: linux
+          #   target: i686-unknown-linux-gnu
+          #   architecture: i686
+          #   use-cross: true
+          # - os: ubuntu-latest
+          #   os-name: linux
+          #   target: armv7-unknown-linux-gnueabihf
+          #   architecture: armv7
+          #   use-cross: true
 
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -31,13 +31,12 @@ jobs:
             architecture: x86_64
             binary-postfix: ".exe"
             use-cross: false
-          # Disabled for now, as aws-lc-sys needs bindgen-cli for manual build with CMake in cross
-          # - os: windows-latest
-          #   os-name: windows
-          #   target: x86_64-pc-windows-gnu
-          #   architecture: x86_64
-          #   binary-postfix: ".exe"
-          #   use-cross: false
+          - os: windows-latest
+            os-name: windows
+            target: x86_64-pc-windows-gnu
+            architecture: x86_64
+            binary-postfix: ".exe"
+            use-cross: false
           - os: macos-13
             os-name: macos
             target: x86_64-apple-darwin
@@ -74,21 +73,12 @@ jobs:
             architecture: arm64
             binary-postfix: ""
             use-cross: true
-          - os: ubuntu-latest
-            os-name: linux
-            target: i686-unknown-linux-gnu
-            architecture: i686
-            binary-postfix: ""
-            use-cross: true
-          # TODO!: This needs a fix, linking `execinfo` fails
-          # + Disabled for now, as aws-lc-sys needs bindgen-cli for manual build with CMake in cross
           # - os: ubuntu-latest
-          #   os-name: netbsd
-          #   target: x86_64-unknown-netbsd
-          #   architecture: x86_64
+          #   os-name: linux
+          #   target: i686-unknown-linux-gnu
+          #   architecture: i686
           #   binary-postfix: ""
           #   use-cross: true
-          # Disabled for now, as aws-lc-sys needs bindgen-cli for manual build with CMake in cross
           # - os: ubuntu-latest
           #   os-name: linux
           #   target: armv7-unknown-linux-gnueabihf

diff --git a/.github/workflows/prebuilt-pr.yml b/.github/workflows/prebuilt-pr.yml
@@ -68,20 +68,12 @@ jobs:
             architecture: arm64
             binary-postfix: ""
             use-cross: true
-          - os: ubuntu-latest
-            os-name: linux
-            target: i686-unknown-linux-gnu
-            architecture: i686
-            binary-postfix: ""
-            use-cross: true
-          # Disabled for now, as aws-lc-sys needs bindgen-cli for manual build with CMake in cross
           # - os: ubuntu-latest
-          #   os-name: netbsd
-          #   target: x86_64-unknown-netbsd
-          #   architecture: x86_64
+          #   os-name: linux
+          #   target: i686-unknown-linux-gnu
+          #   architecture: i686
           #   binary-postfix: ""
           #   use-cross: true
-          # Disabled for now, as aws-lc-sys needs bindgen-cli for manual build with CMake in cross
           # - os: ubuntu-latest
           #   os-name: linux
           #   target: armv7-unknown-linux-gnueabihf

diff --git a/.github/workflows/release-cd.yml b/.github/workflows/release-cd.yml
@@ -59,20 +59,12 @@ jobs:
             architecture: arm64
             binary-postfix: ""
             use-cross: true
-          - os: ubuntu-latest
-            os-name: linux
-            target: i686-unknown-linux-gnu
-            architecture: i686
-            binary-postfix: ""
-            use-cross: true
-          # Disabled for now, as aws-lc-sys needs bindgen-cli for manual build with CMake in cross
           # - os: ubuntu-latest
-          #   os-name: netbsd
-          #   target: x86_64-unknown-netbsd
-          #   architecture: x86_64
+          #   os-name: linux
+          #   target: i686-unknown-linux-gnu
+          #   architecture: i686
           #   binary-postfix: ""
           #   use-cross: true
-          # Disabled for now, as aws-lc-sys needs bindgen-cli for manual build with CMake in cross
           # - os: ubuntu-latest
           #   os-name: linux
           #   target: armv7-unknown-linux-gnueabihf

diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
diff --git a/Cross.toml b/Cross.toml
@@ -5,6 +5,12 @@ pre-build = [
   "apt-get update && apt-get --assume-yes install nasm:$CROSS_DEB_ARCH libssl-dev:$CROSS_DEB_ARCH",
 ]
 
+[target.i686-unknown-linux-gnu]
+pre-build = [
+  "dpkg --add-architecture $CROSS_DEB_ARCH",
+  "apt-get update && apt-get --assume-yes install gcc-multilib-i686-linux-gnu:$CROSS_DEB_ARCH gcc-i686-linux-gnu:$CROSS_DEB_ARCH"
+]
+
 [target.x86_64-pc-windows-gnu.env]
 passthrough = [
   "AWS_LC_SYS_PREBUILT_NASM=1",