diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0934e42b277e4..0647e1421b3b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 91eab2e7a0816..aa31bc8d74f66 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -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}" ;; @@ -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}"