Skip to content

Commit 78f12c8

Browse files
committed
Auto merge of #136812 - ChrisDenton:mingw-ci, r=<try>
[DO NOT MERGE] try-job: dist-i686-mingw
2 parents c03c38d + b1da5e7 commit 78f12c8

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

.github/workflows/ci.yml

+9
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ jobs:
149149

150150
- name: install MinGW
151151
run: src/ci/scripts/install-mingw.sh
152+
153+
- name: show the current environment
154+
run: src/ci/scripts/dump-environment.sh
152155

153156
- name: install ninja
154157
run: src/ci/scripts/install-ninja.sh
@@ -172,6 +175,12 @@ jobs:
172175

173176
- name: ensure the stable version number is correct
174177
run: src/ci/scripts/verify-stable-version-number.sh
178+
179+
- name: show the current environment
180+
run: src/ci/scripts/dump-environment.sh
181+
182+
- name: exit
183+
run: exit 1
175184

176185
- name: run the build
177186
# Redirect stderr to stdout to avoid reordering the two streams in the GHA logs.

src/ci/scripts/install-mingw.sh

+7
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,25 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
99
MINGW_ARCHIVE_32="i686-14.1.0-release-posix-dwarf-msvcrt-rt_v12-rev0.7z"
1010
MINGW_ARCHIVE_64="x86_64-14.1.0-release-posix-seh-msvcrt-rt_v12-rev0.7z"
1111

12+
echo "running install-mingw.sh"
13+
1214
if isWindows && isKnownToBeMingwBuild; then
15+
echo "I am mingw on Windows"
1316
case "${CI_JOB_NAME}" in
1417
*i686*)
1518
bits=32
1619
mingw_archive="${MINGW_ARCHIVE_32}"
20+
echo "I have 32-bits"
1721
;;
1822
*x86_64*)
1923
bits=64
2024
mingw_archive="${MINGW_ARCHIVE_64}"
25+
echo "I have 64-bits"
2126
;;
2227
*aarch64*)
2328
# aarch64 is a cross-compiled target. Use the x86_64
2429
# mingw, since that's the host architecture.
30+
echo "I should not be here"
2531
bits=64
2632
mingw_archive="${MINGW_ARCHIVE_64}"
2733
;;
@@ -36,5 +42,6 @@ if isWindows && isKnownToBeMingwBuild; then
3642

3743
curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
3844
7z x -y mingw.7z > /dev/null
45+
ciCommandSetEnv MSYS2_PATH_TYPE inherit
3946
ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
4047
fi

0 commit comments

Comments
 (0)