Skip to content

Commit

Permalink
Unset MSYS env everywhere
Browse files Browse the repository at this point in the history 
See actions/toolkit#1311
  • Loading branch information
@lazka
lazka committed Jan 14, 2023
1 parent 63f65d3 commit e2f4f87
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions autobuild.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,10 @@ def run_cmd(msys2_root: _PathLike, args: Sequence[_PathLike], **kwargs: Any) ->
env["MSYSTEM"] = "MSYS"
env["MSYS2_PATH_TYPE"] = "minimal"

# GH actions have started to set MSYS globally, make sure we ignore it
# /~https://github.com/actions/toolkit/issues/1311#issuecomment-1382339390
env.pop("MSYS", None)

def shlex_join(split_command: Sequence[str]) -> str:
# shlex.join got added in 3.8 while we support 3.6
return ' '.join(shlex.quote(arg) for arg in split_command)
Expand Down

3 comments on commit e2f4f87

@MehdiChinoune
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't be also unset on MINGW-packages jobs?

@lazka
Copy link
Member Author

@lazka lazka commented on e2f4f87 Jan 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

@lazka
Copy link
Member Author

@lazka lazka commented on e2f4f87 Jan 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've reverted it in setup-msys2, so that should cover MINGW-packages too (we don't use the extra cache action there)

Please sign in to comment.