From f16850e5f8c2f2ffbb57eac104edfbb56094aff4 Mon Sep 17 00:00:00 2001
From: Skgland <bennet.blessmann+github@googlemail.com>
Date: Sat, 25 Apr 2026 21:41:59 +0200
Subject: [PATCH] fix ci and setup cross-compilation

---
 .cargo/config.toml                    |  2 ++
 .github/actions/setup-rust/action.yml |  7 +++++++
 .github/workflows/ci.yml              | 14 ++++++++------
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 .cargo/config.toml

diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 00000000..8971f27a
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,2 @@
+[target.s390x-unknown-linux-gnu]
+linker = "/usr/bin/s390x-linux-gnu-gcc"
diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml
index 45f087e6..c30064eb 100644
--- a/.github/actions/setup-rust/action.yml
+++ b/.github/actions/setup-rust/action.yml
@@ -32,6 +32,13 @@ runs:
       sudo apt-get install libssl-dev:i386 gcc-multilib clang -y
       echo "CC=clang" >> $GITHUB_ENV
       echo "PKG_CONFIG_SYSROOT_DIR=/" >> $GITHUB_ENV
+      
+  - name: Install s390x cross-compilation toolchain
+    if: ${{ matrix.target == 's390x-unknown-linux-gnu' }}
+    shell: bash
+    run: |
+      sudo apt-get update
+      sudo apt-get install -y gcc-s390x-linux-gnu
 
   - uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
     with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 912932e4..1f3d6905 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,20 +61,22 @@ jobs:
           # FIXME(issue #2138): run wasm tests, failing to run since https://github.com/mthom/scryer-prolog/pull/2137 removed wasm-pack
           - { os: ubuntu-22.04,   rust-version: nightly, target: 'wasm32-unknown-unknown',   publish: true, args: '--no-default-features' , test-args: '--no-run --no-default-features', use_swap: true }
           # Cargo.toml rust-version
-          - { os: ubuntu-22.04,   rust-version: "${{ needs.read-msrv.outputs.msrv }}" ,  target: 'x86_64-unknown-linux-gnu'}
-          - { os: ubuntu-22.04,   rust-version: beta,    target: 'x86_64-unknown-linux-gnu'}
-          - { os: ubuntu-22.04,   rust-version: nightly, target: 'x86_64-unknown-linux-gnu', miri: true, components: "miri"} 
-          # run miri for a big-endian target, without features that require a native library i.e. without crypto, crypto-full, ffi, http, tls
-          - { os: ubuntu-22.04,   rust-version: nightly, target: 's390x-unknown-linux-gnu', miri: true, components: "miri", args: '--no-default-features --features=repl,hostname', test-args: '--no-run --no-default-features --features=repl,hostname', miri-args: '--no-default-features --features=repl,hostname' } 
+          - { os: ubuntu-22.04,   rust-version: "${{ needs.read-msrv.outputs.msrv }}" ,  target: 'x86_64-unknown-linux-gnu' }
+          - { os: ubuntu-22.04,   rust-version: beta,    target: 'x86_64-unknown-linux-gnu' }
+          - { os: ubuntu-22.04,   rust-version: nightly, target: 'x86_64-unknown-linux-gnu', miri: true, components: "miri" } 
+          # run miri for a big-endian target, without features that require openssl i.e. without http, tls
+          - { os: ubuntu-22.04,   rust-version: nightly, target: 's390x-unknown-linux-gnu', miri: true, components: "miri", args: '--no-default-features --features=repl,hostname,crypto-full,ffi', test-args: '--no-run --no-default-features --features=repl,hostname,crypto-full,ffi' } 
     defaults:
       run:
         shell: bash
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+
       - uses: actionhippie/swap-space@0cffa893f224708cfb6b011690d8ba819d69c10f # v1.1.0
         if: matrix.use_swap
         with:
           size: 10G
+
       - name: Setup Rust
         uses: ./.github/actions/setup-rust
         with:
@@ -91,7 +93,7 @@ jobs:
 
       - name: Check miri
         if: matrix.miri
-        run: cargo miri test
+        run: cargo miri test ${{ matrix.args }}
 
       # On stable rust builds, build a binary and publish as a github actions
       # artifact. These binaries could be useful for testing the pipeline but
-- 
2.54.0