Skip to content

[DO NOT MERGE] #136812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 14 commits into from
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ jobs:
- name: disable git crlf conversion
run: src/ci/scripts/disable-git-crlf-conversion.sh

- name: checkout submodules
run: src/ci/scripts/checkout-submodules.sh
#- name: checkout submodules
# run: src/ci/scripts/checkout-submodules.sh

- name: install MinGW
run: src/ci/scripts/install-mingw.sh
Expand Down Expand Up @@ -173,6 +173,12 @@ jobs:
- name: ensure the stable version number is correct
run: src/ci/scripts/verify-stable-version-number.sh

- name: show the current environment
run: src/ci/scripts/dump-environment.sh

- name: exit
run: exit 1

- name: run the build
# Redirect stderr to stdout to avoid reordering the two streams in the GHA logs.
run: src/ci/scripts/run-build-from-ci.sh 2>&1
Expand Down
6 changes: 6 additions & 0 deletions src/ci/scripts/install-mingw.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,17 @@ if isWindows && isKnownToBeMingwBuild; then
*i686*)
bits=32
mingw_archive="${MINGW_ARCHIVE_32}"
echo "I have 32-bits"
;;
*x86_64*)
bits=64
mingw_archive="${MINGW_ARCHIVE_64}"
echo "I have 64-bits"
;;
*aarch64*)
# aarch64 is a cross-compiled target. Use the x86_64
# mingw, since that's the host architecture.
echo "I should not be here"
bits=64
mingw_archive="${MINGW_ARCHIVE_64}"
;;
Expand All @@ -32,6 +35,9 @@ if isWindows && isKnownToBeMingwBuild; then
;;
esac

msys2Path="c:/msys64"
ciCommandAddPath "${msys2Path}/usr/bin"

mingw_dir="mingw${bits}"

curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
Expand Down
Loading