diff options
| author | Brad King <brad.king@kitware.com> | 2023-09-08 17:26:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-09-08 19:31:22 (GMT) |
| commit | b2555f27ace59b4d299ca9578b10fbdb3906e5cb (patch) | |
| tree | 5fa606576334ce0f7ef7d1d0b73ea4e2bbfec6c2 | |
| parent | 91585ad105ff611fbaa507e758a5c9043bb9d142 (diff) | |
| download | CMake-b2555f27ace59b4d299ca9578b10fbdb3906e5cb.zip CMake-b2555f27ace59b4d299ca9578b10fbdb3906e5cb.tar.gz CMake-b2555f27ace59b4d299ca9578b10fbdb3906e5cb.tar.bz2 | |
ci: Improve MinGW/MSYS Makefiles mingw.osdn.io job environments
Set `PATH`, `MSYSTEM`, and `MAKE_MODE` environment variables the way the
MinGW/MSYS 1.0 distribution from `mingw.osdn.io` does in its bash prompt.
| -rwxr-xr-x | .gitlab/ci/env_mingw_osdn_io_mingw_makefiles.ps1 | 4 | ||||
| -rwxr-xr-x | .gitlab/ci/env_mingw_osdn_io_msys_makefiles.ps1 | 6 | ||||
| -rwxr-xr-x | .gitlab/ci/mingw-env.ps1 | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/.gitlab/ci/env_mingw_osdn_io_mingw_makefiles.ps1 b/.gitlab/ci/env_mingw_osdn_io_mingw_makefiles.ps1 index e2d573e..f6e1f0a 100755 --- a/.gitlab/ci/env_mingw_osdn_io_mingw_makefiles.ps1 +++ b/.gitlab/ci/env_mingw_osdn_io_mingw_makefiles.ps1 @@ -1,3 +1 @@ -$pwdpath = $pwd.Path -& "$pwsh" -File ".gitlab/ci/mingw.ps1" -Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\mingw\bin;$env:PATH" +. .gitlab/ci/mingw-env.ps1 diff --git a/.gitlab/ci/env_mingw_osdn_io_msys_makefiles.ps1 b/.gitlab/ci/env_mingw_osdn_io_msys_makefiles.ps1 index 6eccb72..f6e1f0a 100755 --- a/.gitlab/ci/env_mingw_osdn_io_msys_makefiles.ps1 +++ b/.gitlab/ci/env_mingw_osdn_io_msys_makefiles.ps1 @@ -1,5 +1 @@ -$pwdpath = $pwd.Path -& "$pwsh" -File ".gitlab/ci/mingw.ps1" -Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\mingw\msys\1.0\bin;$pwdpath\.gitlab\mingw\bin;$env:PATH" -$env:MSYSTEM = 'MINGW32' -$env:MAKE_MODE = 'unix' +. .gitlab/ci/mingw-env.ps1 diff --git a/.gitlab/ci/mingw-env.ps1 b/.gitlab/ci/mingw-env.ps1 new file mode 100755 index 0000000..d68a7f7 --- /dev/null +++ b/.gitlab/ci/mingw-env.ps1 @@ -0,0 +1,5 @@ +$pwdpath = $pwd.Path +& "$pwsh" -File ".gitlab/ci/mingw.ps1" +Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\mingw\bin;$pwdpath\.gitlab\mingw\msys\1.0\bin;$env:PATH" +$env:MSYSTEM = 'MINGW32' +$env:MAKE_MODE = 'unix' |