Skip to content

Commit 3c3a831

Browse files
committed
Go back to always using cross on Linux
Because technically even the "non-cross" compilation is cross compilation, as it is targeting `x86_64-unknown-linux-musl`. When `cargo` rather than `cross` is used in that build, `ring` fails to compile C code due to the `musl-gcc` command not being present. Very likely other dependencies would also fail without more tools installed on the system, and future features we wish to support in binary releases would run into this in further ways. An alternative approach here could be installing `musl-gcc` in a prior step, much as we could also install an ARM gcc suite and probably eliminate `cross` for linux-arm. For now, though, I'm putting this back to using `cross` for all Linux builds.
1 parent a647598 commit 3c3a831

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

.github/workflows/release.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -75,32 +75,26 @@ jobs:
7575
- build: linux
7676
os: ubuntu-latest
7777
rust: stable
78-
cargo: cargo
7978
target: x86_64-unknown-linux-musl
8079
- build: linux-arm
8180
os: ubuntu-latest
8281
rust: nightly
83-
cargo: cross
8482
target: arm-unknown-linux-gnueabihf
8583
- build: macos
8684
os: macos-latest
8785
rust: stable
88-
cargo: cargo
8986
target: x86_64-apple-darwin
9087
- build: win-msvc
9188
os: windows-latest
9289
rust: nightly
93-
cargo: cargo
9490
target: x86_64-pc-windows-msvc
9591
- build: win-gnu
9692
os: windows-latest
9793
rust: nightly-x86_64-gnu
98-
cargo: cargo
9994
target: x86_64-pc-windows-gnu
10095
- build: win32-msvc
10196
os: windows-latest
10297
rust: nightly
103-
cargo: cargo
10498
target: i686-pc-windows-msvc
10599
# on linux we build with musl which causes trouble with open-ssl. For now, just build max-pure there
106100
# even though we could also build with `--features max-control,http-client-reqwest,gitoxide-core-blocking-client,gix-features/fast-sha1` for fast hashing.
@@ -145,7 +139,7 @@ jobs:
145139
targets: ${{ matrix.target }}
146140

147141
- name: Use Cross
148-
if: matrix.cargo == 'cross'
142+
if: matrix.os == 'ubuntu-latest'
149143
run: |
150144
cargo install cross
151145
echo 'CARGO=cross' >> "$GITHUB_ENV"

0 commit comments

Comments
 (0)