diff options
| author | Brad King <brad.king@kitware.com> | 2023-09-09 11:16:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-09-09 11:17:11 (GMT) |
| commit | 1345928f9693a038153c43f09128bac0419d91ed (patch) | |
| tree | 6d2e6c03996c6293e4641013760f260cc7530ae7 | |
| parent | b94a16b5679da3e5c4ec60deda6cebf9d7b161ba (diff) | |
| parent | b2555f27ace59b4d299ca9578b10fbdb3906e5cb (diff) | |
| download | CMake-1345928f9693a038153c43f09128bac0419d91ed.zip CMake-1345928f9693a038153c43f09128bac0419d91ed.tar.gz CMake-1345928f9693a038153c43f09128bac0419d91ed.tar.bz2 | |
Merge topic 'ci-mingw-osdn-io'
b2555f27ac ci: Improve MinGW/MSYS Makefiles mingw.osdn.io job environments
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8786
| -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' |