Browse Source

Merge topic 'ci-mingw-osdn-io'

b2555f27ac ci: Improve MinGW/MSYS Makefiles mingw.osdn.io job environments

Acked-by: Kitware Robot <[email protected]>
Merge-request: !8786
Brad King 2 years ago
parent
commit
1345928f96

+ 1 - 3
.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

+ 1 - 5
.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

+ 5 - 0
.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'