Skip to content

Commit 521d9d5

Browse files
committed
Try bumping mignw-w64 to 12.1
1 parent 5f4e067 commit 521d9d5

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

.github/workflows/ci.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -558,9 +558,12 @@ jobs:
558558
strategy:
559559
matrix:
560560
include:
561-
- name: dist-x86_64-linux
562-
os: ubuntu-20.04-xl
563-
env: {}
561+
- name: i686-mingw-1
562+
env:
563+
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-gnu"
564+
SCRIPT: make ci-mingw-subset-1
565+
CUSTOM_MINGW: 1
566+
os: windows-latest-xl
564567
timeout-minutes: 600
565568
runs-on: "${{ matrix.os }}"
566569
steps:

src/ci/github-actions/ci.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -691,9 +691,12 @@ jobs:
691691
strategy:
692692
matrix:
693693
include:
694-
- &dist-x86_64-linux
695-
name: dist-x86_64-linux
696-
<<: *job-linux-xl
694+
- name: i686-mingw-1
695+
env:
696+
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu
697+
SCRIPT: make ci-mingw-subset-1
698+
CUSTOM_MINGW: 1
699+
<<: *job-windows-xl
697700

698701
master:
699702
name: master

src/ci/scripts/install-mingw.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ if isWindows; then
6464
else
6565
mingw_dir="mingw${bits}"
6666

67-
curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
67+
curl -o mingw.7z "https://github.com/niXman/mingw-builds-binaries/releases/download/12.1.0-rt_v10-rev3/i686-12.1.0-release-posix-dwarf-rt_v10-rev3.7z"
6868
7z x -y mingw.7z > /dev/null
6969
curl -o "${mingw_dir}/bin/gdborig.exe" "${MIRRORS_BASE}/2017-04-20-${bits}bit-gdborig.exe"
7070
ciCommandAddPath "$(pwd)/${mingw_dir}/bin"

0 commit comments

Comments
 (0)