Merge branch 'main' into main

Author: xis19

.github/workflows/benchmarks.yml

@@ -18,8 +18,13 @@ concurrency:
 
 jobs:
   benchmarks:
-    name: Run performance benchmarks (CodSpeed)
+    name: Run ${{ matrix.mode }} benchmarks (CodSpeed)
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        mode:
+          - simulation
+          - memory
     steps:
       - uses: actions/checkout@v6
         with:
@@ -37,40 +42,11 @@ jobs:
         shell: bash
         run: cargo codspeed build
 
-      - name: Run performance benchmarks
+      - name: Run benchmarks
         uses: CodSpeedHQ/action@v4
         env:
           CODSPEED_LOG: debug
         with:
-          mode: simulation
-          run: cargo codspeed run > /dev/null
-          token: ${{ secrets.CODSPEED_TOKEN }}
-
-  memory-benchmarks:
-    name: Run memory benchmarks (CodSpeed)
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-
-      - uses: dtolnay/rust-toolchain@stable
-
-      - uses: Swatinem/rust-cache@v2
-
-      - name: Install cargo-codspeed
-        shell: bash
-        run: cargo install cargo-codspeed --locked
-
-      - name: Build benchmarks for memory analysis
-        shell: bash
-        run: cargo codspeed build -m analysis
-
-      - name: Run memory benchmarks
-        uses: CodSpeedHQ/action@v4
-        env:
-          CODSPEED_LOG: debug
-        with:
-          mode: memory
+          mode: ${{ matrix.mode }}
           run: cargo codspeed run > /dev/null
           token: ${{ secrets.CODSPEED_TOKEN }}

.github/workflows/ci.yml

@@ -98,6 +98,7 @@ jobs:
             extra_desc: cuda12.8
           # # M1 CPU
           - os: macos-14
+          - os: macos-15-intel
           - os: windows-2022
             cuda: "12.8"
             # Oldest supported version, keep in sync with README.md
@@ -240,6 +241,8 @@ jobs:
             target: s390x-unknown-linux-musl
             container: '{"image": "messense/rust-musl-cross:s390x-musl"}'
             lto: "false"
+          - os: ubuntu-22.04
+            target: s390x-unknown-linux-gnu
           - os: ubuntu-22.04
             target: riscv64gc-unknown-linux-musl
             container: '{"image": "messense/rust-musl-cross:riscv64gc-musl"}'
@@ -261,6 +264,9 @@ jobs:
           - os: macos-14
             target: aarch64-apple-darwin
             macosx_deployment_target: 11.0
+          - os: macos-15-intel
+            target: x86_64-apple-darwin
+            macosx_deployment_target: 11.0
           - os: windows-2022
             target: x86_64-pc-windows-msvc
             rustflags: -Ctarget-feature=+crt-static
@@ -277,7 +283,29 @@ jobs:
           toolchain: ${{ matrix.target == 'aarch64-apple-darwin' && 'beta' || 'stable' }}
           target: ${{ matrix.target }}
         if: ${{ !matrix.container }}
-      
+
+      - name: Install s390x cross-compilation toolchain
+        if: ${{ matrix.target == 's390x-unknown-linux-gnu' }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y gcc-s390x-linux-gnu g++-s390x-linux-gnu
+          mkdir -p .cargo
+          cat >> .cargo/config.toml <<EOF
+          [target.s390x-unknown-linux-gnu]
+          linker = "s390x-linux-gnu-gcc"
+          EOF
+
+      - name: Install rust-src for s390x-musl
+        if: ${{ matrix.target == 's390x-unknown-linux-musl' }}
+        run: |
+          # Remove corrupted nightly toolchain if it exists
+          rustup toolchain uninstall nightly || true
+          # Clean up any leftover files
+          rm -rf ~/.rustup/toolchains/nightly-* || true
+          # Install fresh nightly with minimal profile
+          rustup toolchain install nightly --profile minimal
+          rustup component add rust-src --toolchain nightly
+
       - name: fix build openssl error on s390x
         if: ${{  matrix.target  == 's390x-unknown-linux-musl' }}
         run: |
@@ -286,13 +314,24 @@ jobs:
           echo CXXFLAGS="$CFLAGS" >> $GITHUB_ENV
           echo RUSTFLAGS="-C target-cpu=z10" >> $GITHUB_ENV
 
+      - name: Build (s390x-musl with build-std)
+        if: ${{ matrix.target == 's390x-unknown-linux-musl' }}
+        run: cargo +nightly build --locked --release --bin ${{ matrix.binary || 'sccache' }} --target ${{ matrix.target }} --features=openssl/vendored ${{ matrix.extra_args }} -Zbuild-std
+        env:
+          MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
+          DEVELOPER_DIR: ${{ matrix.developer_dir }}
+          SDKROOT: ${{ matrix.sdkroot }}
+          RUSTFLAGS: ${{ env.RUSTFLAGS || matrix.rustflags }}
+          CARGO_PROFILE_RELEASE_LTO: ${{ matrix.lto || 'true' }}
+
       - name: Build
+        if: ${{ matrix.target != 's390x-unknown-linux-musl' }}
         run: cargo build --locked --release --bin ${{ matrix.binary || 'sccache' }} --target ${{ matrix.target }} --features=openssl/vendored ${{ matrix.extra_args }}
         env:
           MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
           DEVELOPER_DIR: ${{ matrix.developer_dir }}
           SDKROOT: ${{ matrix.sdkroot }}
-          RUSTFLAGS: ${{ matrix.rustflags }}
+          RUSTFLAGS: ${{ env.RUSTFLAGS || matrix.rustflags }}
           CARGO_PROFILE_RELEASE_LTO: ${{ matrix.lto || 'true' }}
 
       # Workaround for the lack of substring() function in github actions expressions.