Skip to content

Commit 113af15

Browse files
committed
Stop building and testing mingw cross-toolchain
It isn't all that useful and wine has started crashing in CI
1 parent 4cc1c90 commit 113af15

File tree

2 files changed

+0
-58
lines changed

2 files changed

+0
-58
lines changed

.github/workflows/main.yml

-36
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@ jobs:
5656
- os: macos-latest
5757
env:
5858
TARGET_TRIPLE: x86_64-apple-darwin
59-
# Wine started crashing for whatever reason
60-
# # cross-compile from Linux to Windows using mingw
61-
# - os: ubuntu-latest
62-
# env:
63-
# TARGET_TRIPLE: x86_64-pc-windows-gnu
64-
# apt_deps: gcc-mingw-w64-x86-64 wine-stable
6559
- os: ubuntu-latest
6660
env:
6761
TARGET_TRIPLE: aarch64-unknown-linux-gnu
@@ -114,15 +108,6 @@ jobs:
114108
- name: Prepare dependencies
115109
run: ./y.sh prepare
116110

117-
# The Wine version shipped with Ubuntu 22.04 doesn't implement bcryptprimitives.dll
118-
- name: Build bcryptprimitives.dll shim for Wine
119-
if: matrix.os == 'ubuntu-latest' && matrix.env.TARGET_TRIPLE == 'x86_64-pc-windows-gnu'
120-
run: |
121-
rustup target add x86_64-pc-windows-gnu
122-
mkdir wine_shims
123-
rustc patches/bcryptprimitives.rs -Copt-level=3 -Clto=fat --out-dir wine_shims --target x86_64-pc-windows-gnu
124-
echo "WINEPATH=$(pwd)/wine_shims" >> $GITHUB_ENV
125-
126111
- name: Build
127112
run: ./y.sh build --sysroot none
128113

@@ -136,9 +121,6 @@ jobs:
136121

137122
# This is roughly config rust-lang/rust uses for testing
138123
- name: Test with LLVM sysroot
139-
# Skip native x86_64-pc-windows-gnu. It is way too slow and cross-compiled
140-
# x86_64-pc-windows-gnu covers at least part of the tests.
141-
if: matrix.os != 'windows-latest' || matrix.env.TARGET_TRIPLE != 'x86_64-pc-windows-gnu'
142124
env:
143125
TARGET_TRIPLE: ${{ matrix.env.TARGET_TRIPLE }}
144126
run: ./y.sh test --sysroot llvm --no-unstable-features
@@ -216,10 +198,6 @@ jobs:
216198
- os: macos-latest
217199
env:
218200
TARGET_TRIPLE: aarch64-apple-darwin
219-
# cross-compile from Linux to Windows using mingw
220-
- os: ubuntu-latest
221-
env:
222-
TARGET_TRIPLE: x86_64-pc-windows-gnu
223201
- os: windows-latest
224202
env:
225203
TARGET_TRIPLE: x86_64-pc-windows-msvc
@@ -244,12 +222,6 @@ jobs:
244222
if: matrix.os == 'macos-latest' && matrix.env.TARGET_TRIPLE == 'x86_64-apple-darwin'
245223
run: rustup set default-host x86_64-apple-darwin
246224

247-
- name: Install MinGW toolchain
248-
if: matrix.os == 'ubuntu-latest' && matrix.env.TARGET_TRIPLE == 'x86_64-pc-windows-gnu'
249-
run: |
250-
sudo apt-get update
251-
sudo apt-get install -y gcc-mingw-w64-x86-64
252-
253225
- name: Prepare dependencies
254226
run: ./y.sh prepare
255227

@@ -263,19 +235,11 @@ jobs:
263235
run: tar cvfJ cg_clif.tar.xz dist
264236

265237
- name: Upload prebuilt cg_clif
266-
if: matrix.os == 'windows-latest' || matrix.env.TARGET_TRIPLE != 'x86_64-pc-windows-gnu'
267238
uses: actions/upload-artifact@v4
268239
with:
269240
name: cg_clif-${{ matrix.env.TARGET_TRIPLE }}
270241
path: cg_clif.tar.xz
271242

272-
- name: Upload prebuilt cg_clif (cross compile)
273-
if: matrix.os != 'windows-latest' && matrix.env.TARGET_TRIPLE == 'x86_64-pc-windows-gnu'
274-
uses: actions/upload-artifact@v4
275-
with:
276-
name: cg_clif-${{ runner.os }}-cross-x86_64-mingw
277-
path: cg_clif.tar.xz
278-
279243
release:
280244
runs-on: ubuntu-latest
281245
timeout-minutes: 10

patches/bcryptprimitives.rs

-22
This file was deleted.

0 commit comments

Comments
 (0)