From 041f64256c0d1a67cb25a62bddc6dada8c839c91 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 10 Feb 2025 10:12:45 +0000 Subject: [PATCH 01/14] [DO NOT MERGE] --- src/ci/scripts/install-mingw.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 91eab2e7a0816..bf6eb8d78a347 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -9,19 +9,25 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" MINGW_ARCHIVE_32="i686-14.1.0-release-posix-dwarf-msvcrt-rt_v12-rev0.7z" MINGW_ARCHIVE_64="x86_64-14.1.0-release-posix-seh-msvcrt-rt_v12-rev0.7z" +echo "running install-mingw.sh" + if isWindows && isKnownToBeMingwBuild; then + echo "I am mingw on Windows" case "${CI_JOB_NAME}" in *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}" ;; @@ -31,6 +37,7 @@ if isWindows && isKnownToBeMingwBuild; then exit 1 ;; esac + exit 1 mingw_dir="mingw${bits}" From 57615cb8849f2e644cf1449c161ff45ef6860344 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 10 Feb 2025 10:22:46 +0000 Subject: [PATCH 02/14] [DO NOT MERGE] --- .github/workflows/ci.yml | 9 +++++++++ src/ci/scripts/install-mingw.sh | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0934e42b277e4..d0e6940808412 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -149,6 +149,9 @@ jobs: - name: install MinGW run: src/ci/scripts/install-mingw.sh + + - name: show the current environment + run: src/ci/scripts/dump-environment.sh - name: install ninja run: src/ci/scripts/install-ninja.sh @@ -172,6 +175,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. diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index bf6eb8d78a347..7001505f86c56 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -37,7 +37,6 @@ if isWindows && isKnownToBeMingwBuild; then exit 1 ;; esac - exit 1 mingw_dir="mingw${bits}" From b1da5e730763f7423eadd533e2a3835530fafacd Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 10 Feb 2025 11:06:45 +0000 Subject: [PATCH 03/14] Update install-mingw.sh --- src/ci/scripts/install-mingw.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 7001505f86c56..70aae205a5c79 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -42,5 +42,6 @@ if isWindows && isKnownToBeMingwBuild; then curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" 7z x -y mingw.7z > /dev/null + ciCommandSetEnv MSYS2_PATH_TYPE inherit ciCommandAddPath "$(pwd)/${mingw_dir}/bin" fi From cb463491b480dbe6bab667772e42664b0d216d5d Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 10 Feb 2025 11:15:30 +0000 Subject: [PATCH 04/14] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0e6940808412..9eac30d9d589c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,8 @@ defaults: # shell. (This should only make a difference on Windows, where the default # shell is PowerShell.) shell: bash + env: + MSYS2_PATH_TYPE: inherit concurrency: # For a given workflow, if we push to the same branch, cancel all previous builds on that branch. From b3ae35002531e7e30ba357d3d01f86205f9481db Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 10 Feb 2025 11:20:49 +0000 Subject: [PATCH 05/14] Update ci.yml --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9eac30d9d589c..7f0cfaf023f9b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,8 +29,6 @@ defaults: # shell. (This should only make a difference on Windows, where the default # shell is PowerShell.) shell: bash - env: - MSYS2_PATH_TYPE: inherit concurrency: # For a given workflow, if we push to the same branch, cancel all previous builds on that branch. @@ -42,6 +40,7 @@ env: TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate" # This will be empty in PR jobs. TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }} + MSYS2_PATH_TYPE: inherit jobs: # The job matrix for `calculate_matrix` is defined in src/ci/github-actions/jobs.yml. # It calculates which jobs should be executed, based on the data of the ${{ github }} context. From 165d02710719cc55e01f917a53150e835cd21b12 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 10 Feb 2025 11:59:50 +0000 Subject: [PATCH 06/14] Update install-mingw.sh --- src/ci/scripts/install-mingw.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 70aae205a5c79..89fab92bad7c9 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -9,10 +9,11 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" MINGW_ARCHIVE_32="i686-14.1.0-release-posix-dwarf-msvcrt-rt_v12-rev0.7z" MINGW_ARCHIVE_64="x86_64-14.1.0-release-posix-seh-msvcrt-rt_v12-rev0.7z" -echo "running install-mingw.sh" - if isWindows && isKnownToBeMingwBuild; then - echo "I am mingw on Windows" + msys2Path="c:/msys64" + mkdir -p "${msys2Path}/home/${USERNAME}" + ciCommandAddPath "${msys2Path}/usr/bin" + case "${CI_JOB_NAME}" in *i686*) bits=32 From bcb3c8c07ea1ad1f2d7c980dd6c145eebb521c62 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 10 Feb 2025 13:11:59 +0000 Subject: [PATCH 07/14] Update install-mingw.sh --- src/ci/scripts/install-mingw.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 89fab92bad7c9..ae4bfa8ec734f 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -43,6 +43,6 @@ if isWindows && isKnownToBeMingwBuild; then curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" 7z x -y mingw.7z > /dev/null - ciCommandSetEnv MSYS2_PATH_TYPE inherit + ciCommandAddPath "/usr/bin" ciCommandAddPath "$(pwd)/${mingw_dir}/bin" fi From ee827bf83ee1d18c7df1a74c7b57b87a99eeca77 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 10 Feb 2025 13:14:59 +0000 Subject: [PATCH 08/14] Update install-mingw.sh --- src/ci/scripts/install-mingw.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index ae4bfa8ec734f..b3176df8893ab 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -10,9 +10,6 @@ MINGW_ARCHIVE_32="i686-14.1.0-release-posix-dwarf-msvcrt-rt_v12-rev0.7z" MINGW_ARCHIVE_64="x86_64-14.1.0-release-posix-seh-msvcrt-rt_v12-rev0.7z" if isWindows && isKnownToBeMingwBuild; then - msys2Path="c:/msys64" - mkdir -p "${msys2Path}/home/${USERNAME}" - ciCommandAddPath "${msys2Path}/usr/bin" case "${CI_JOB_NAME}" in *i686*) From c434f1d869dc69c44b302c14ab95bade9db4be97 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 10 Feb 2025 14:26:25 +0000 Subject: [PATCH 09/14] [DO NOT MERGE] --- .github/workflows/ci.yml | 8 ++------ src/ci/scripts/install-mingw.sh | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f0cfaf023f9b..a7a6892432c08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,6 @@ env: TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate" # This will be empty in PR jobs. TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }} - MSYS2_PATH_TYPE: inherit jobs: # The job matrix for `calculate_matrix` is defined in src/ci/github-actions/jobs.yml. # It calculates which jobs should be executed, based on the data of the ${{ github }} context. @@ -150,9 +149,6 @@ jobs: - name: install MinGW run: src/ci/scripts/install-mingw.sh - - - name: show the current environment - run: src/ci/scripts/dump-environment.sh - name: install ninja run: src/ci/scripts/install-ninja.sh @@ -176,10 +172,10 @@ 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 diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index b3176df8893ab..4dfbc463fcead 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -10,7 +10,6 @@ MINGW_ARCHIVE_32="i686-14.1.0-release-posix-dwarf-msvcrt-rt_v12-rev0.7z" MINGW_ARCHIVE_64="x86_64-14.1.0-release-posix-seh-msvcrt-rt_v12-rev0.7z" if isWindows && isKnownToBeMingwBuild; then - case "${CI_JOB_NAME}" in *i686*) bits=32 @@ -40,6 +39,5 @@ if isWindows && isKnownToBeMingwBuild; then curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" 7z x -y mingw.7z > /dev/null - ciCommandAddPath "/usr/bin" ciCommandAddPath "$(pwd)/${mingw_dir}/bin" fi From add0130cec9b9f5b50e2c810124d4eed2e62c9db Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 10 Feb 2025 14:30:08 +0000 Subject: [PATCH 10/14] Update install-mingw.sh --- src/ci/scripts/install-mingw.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 4dfbc463fcead..2b1db24a31978 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -35,6 +35,10 @@ if isWindows && isKnownToBeMingwBuild; then ;; esac + msys2Path="c:/msys64" + mkdir -p "${msys2Path}/home/${USERNAME}" + ciCommandAddPath "/usr/bin" + mingw_dir="mingw${bits}" curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" From a8c3ffb53434f4b1f5589f8d3adbc6f04abdf14f Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 10 Feb 2025 14:31:14 +0000 Subject: [PATCH 11/14] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7a6892432c08..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 From 2d94b647f8e5ddbd75b7900f17b365d54e0e2c3e Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 10 Feb 2025 14:37:19 +0000 Subject: [PATCH 12/14] Update install-mingw.sh --- src/ci/scripts/install-mingw.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 2b1db24a31978..aa31bc8d74f66 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -36,8 +36,7 @@ if isWindows && isKnownToBeMingwBuild; then esac msys2Path="c:/msys64" - mkdir -p "${msys2Path}/home/${USERNAME}" - ciCommandAddPath "/usr/bin" + ciCommandAddPath "${msys2Path}/usr/bin" mingw_dir="mingw${bits}" From 9c8f57846d3caaef1dad6d8f43a7f12e10e9418f Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 10 Feb 2025 14:54:38 +0000 Subject: [PATCH 13/14] Update install-mingw.sh --- src/ci/scripts/install-mingw.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index aa31bc8d74f66..729aa02aebed8 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -35,7 +35,7 @@ if isWindows && isKnownToBeMingwBuild; then ;; esac - msys2Path="c:/msys64" + msys2Path="/c/msys64" ciCommandAddPath "${msys2Path}/usr/bin" mingw_dir="mingw${bits}" From cfa9e9c91a76dc133eba59a5bb62a7e13ea9e9f4 Mon Sep 17 00:00:00 2001 From: Chris Denton Date: Mon, 10 Feb 2025 14:59:00 +0000 Subject: [PATCH 14/14] Update install-mingw.sh --- src/ci/scripts/install-mingw.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 729aa02aebed8..aa31bc8d74f66 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -35,7 +35,7 @@ if isWindows && isKnownToBeMingwBuild; then ;; esac - msys2Path="/c/msys64" + msys2Path="c:/msys64" ciCommandAddPath "${msys2Path}/usr/bin" mingw_dir="mingw${bits}"