Skip to content

Commit 6b9e54f

Browse files
committed
fix: use cdylib-capable Rust for musl builds
Keep Rust 1.85 as the source MSRV, but pin Rust 1.97.1 for the two musl release artifacts because the 1.85 musl targets cannot emit cdylibs.
1 parent bda181b commit 6b9e54f

3 files changed

Lines changed: 15 additions & 2 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
runs-on: ${{ matrix.runner }}
7575
steps:
7676
- uses: actions/checkout@v4
77-
- uses: dtolnay/rust-toolchain@1.85.0
77+
- uses: dtolnay/rust-toolchain@1.97.1
7878
with:
7979
targets: ${{ matrix.rid == 'linux-musl-x64' && 'x86_64-unknown-linux-musl' || 'aarch64-unknown-linux-musl' }}
8080
- uses: actions/setup-dotnet@v4

‎.github/workflows/release.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,40 +49,49 @@ jobs:
4949
- runner: windows-latest
5050
rid: win-x64
5151
target: x86_64-pc-windows-msvc
52+
rust: 1.85.0
5253
zig: false
5354
- runner: windows-11-arm
5455
rid: win-arm64
5556
target: aarch64-pc-windows-msvc
57+
rust: 1.85.0
5658
zig: false
5759
- runner: ubuntu-latest
5860
rid: linux-x64
5961
target: x86_64-unknown-linux-gnu
62+
rust: 1.85.0
6063
zig: false
6164
- runner: ubuntu-24.04-arm
6265
rid: linux-arm64
6366
target: aarch64-unknown-linux-gnu
67+
rust: 1.85.0
6468
zig: false
6569
- runner: ubuntu-latest
6670
rid: linux-musl-x64
6771
target: x86_64-unknown-linux-musl
72+
rust: 1.97.1
6873
zig: true
6974
- runner: ubuntu-24.04-arm
7075
rid: linux-musl-arm64
7176
target: aarch64-unknown-linux-musl
77+
rust: 1.97.1
7278
zig: true
7379
- runner: macos-15-intel
7480
rid: osx-x64
7581
target: x86_64-apple-darwin
82+
rust: 1.85.0
7683
zig: false
7784
- runner: macos-latest
7885
rid: osx-arm64
7986
target: aarch64-apple-darwin
87+
rust: 1.85.0
8088
zig: false
8189
runs-on: ${{ matrix.runner }}
8290
steps:
8391
- uses: actions/checkout@v4
84-
- uses: dtolnay/rust-toolchain@1.85.0
92+
- uses: dtolnay/rust-toolchain@master
8593
with:
94+
toolchain: ${{ matrix.rust }}
8695
targets: ${{ matrix.target }}
8796
- uses: mlugg/setup-zig@v2
8897
if: matrix.zig

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ library under `runtimes/{rid}/native/`. .NET selects the matching asset at publi
4747

4848
Rust 1.85 and .NET SDK 8 or later are required.
4949

50+
Rust 1.85 is the source MSRV and builds the Windows, GNU Linux, and macOS libraries. The
51+
official Rust 1.85 musl targets cannot emit `cdylib` artifacts, so release automation pins
52+
Rust 1.97.1 for the two musl libraries.
53+
5054
```powershell
5155
cargo test --workspace --all-targets --locked
5256
dotnet build ./src/MiniExcelRust/MiniExcelRust.csproj -c Release

0 commit comments

Comments
 (0)