feat: enable i686-unknown-linux-gnu support in CI workflows and updat…

…e targets (#75)

Signed-off-by: simonsan <[email protected]>

.cargo/config.toml

@@ -17,3 +17,7 @@ linker = "aarch64-linux-gnu-gcc"
 
 [target.i686-unknown-linux-gnu]
 linker = "i686-linux-gnu-gcc"
+
+[env]
+CC_i686-unknown-linux-gnu = "i686-linux-gnu-gcc"
+CC_aarch64_unknown_linux_musl = "aarch64-linux-gnu-gcc"

.github/workflows/cross-ci.yml

@@ -71,11 +71,11 @@ 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: linux
+            target: i686-unknown-linux-gnu
+            architecture: i386
+            use-cross: true
           # - os: ubuntu-latest
           #   os-name: linux
           #   target: armv7-unknown-linux-gnueabihf

.github/workflows/nightly.yml

@@ -73,12 +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
+          - os: ubuntu-latest
+            os-name: linux
+            target: i686-unknown-linux-gnu
+            architecture: i386
+            binary-postfix: ""
+            use-cross: true
           # - os: ubuntu-latest
           #   os-name: linux
           #   target: armv7-unknown-linux-gnueabihf

.github/workflows/prebuilt-pr.yml

@@ -68,12 +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
+          - os: ubuntu-latest
+            os-name: linux
+            target: i686-unknown-linux-gnu
+            architecture: i386
+            binary-postfix: ""
+            use-cross: true
           # - os: ubuntu-latest
           #   os-name: linux
           #   target: armv7-unknown-linux-gnueabihf

Cross.toml

@@ -6,9 +6,10 @@ pre-build = [
 ]
 
 [target.i686-unknown-linux-gnu]
+image = "ghcr.io/cross-rs/i686-unknown-linux-gnu:edge"
 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",
+  "apt-get update && apt-get --assume-yes install gcc-multilib-i686-linux-gnu gcc-i686-linux-gnu",
 ]
 
 [target.x86_64-pc-windows-gnu.env]

dist-workspace.toml

@@ -12,7 +12,7 @@ ci = "github"
 # The installers to generate for each app
 installers = ["shell", "powershell", "homebrew", "msi"]
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
+targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc", "i686-unknown-linux-gnu"]
 # Path that installers should place binaries in
 install-path = "CARGO_HOME"
 # Whether to install an updater program