Skip to content
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.

Sign up for GitHub

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

CI: Stop /msys64/bin from being prepended to PATH in msys2 shell #136815

Merged
merged 2 commits into from
Feb 20, 2025
Merged

CI: Stop /msys64/bin from being prepended to PATH in msys2 shell #136815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5573cd3
Prevent /msys64/bin from being prepended to PATH
ChrisDenton Feb 10, 2025
ec8ec41
Print the environment a second time
ChrisDenton Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,11 @@ jobs:
- name: ensure the stable version number is correct
run: src/ci/scripts/verify-stable-version-number.sh

# Show the environment just before we run the build
# This makes it easier to diagnose problems with the above install scripts.
- name: show the current environment
run: src/ci/scripts/dump-environment.sh

- 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ if isWindows && isKnownToBeMingwBuild; then
;;
esac

# Stop /msys64/bin from being prepended to PATH by adding the bin directory manually.
# Note that this intentionally uses a Windows style path instead of the msys2 path to
# avoid being auto-translated into `/usr/bin`, which will not have the desired effect.
msys2Path="c:/msys64"
ciCommandAddPath "${msys2Path}/usr/bin"

mingw_dir="mingw${bits}"

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