diff options
| author | Brad King <brad.king@kitware.com> | 2023-04-05 10:38:06 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-04-05 10:46:15 -0400 |
| commit | 430aa379d41ee3890957d070a0105468369ab755 (patch) | |
| tree | e2a38b7c96e8529e8a4e6f953d87b39b496b5845 /.gitlab | |
| parent | eb2bdbd3013f482c4db5c599c1c528ad0e7eb92d (diff) | |
| download | cmake-430aa379d41ee3890957d070a0105468369ab755.tar.gz | |
ci: De-duplicate Windows test script for OpenWatcom job
Move job-specific setup to an environment script.
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci/env_windows_openwatcom1.9.ps1 | 1 | ||||
| -rwxr-xr-x | .gitlab/ci/openwatcom-env.ps1 | 7 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 16 |
3 files changed, 8 insertions, 16 deletions
diff --git a/.gitlab/ci/env_windows_openwatcom1.9.ps1 b/.gitlab/ci/env_windows_openwatcom1.9.ps1 new file mode 100755 index 0000000000..49c28f7a20 --- /dev/null +++ b/.gitlab/ci/env_windows_openwatcom1.9.ps1 @@ -0,0 +1 @@ +. .gitlab/ci/openwatcom-env.ps1 diff --git a/.gitlab/ci/openwatcom-env.ps1 b/.gitlab/ci/openwatcom-env.ps1 new file mode 100755 index 0000000000..14ea523028 --- /dev/null +++ b/.gitlab/ci/openwatcom-env.ps1 @@ -0,0 +1,7 @@ +Invoke-Expression -Command .gitlab/ci/openwatcom.ps1 +$pwdpath = $pwd.Path +Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\watcom\binnt;$pwdpath\.gitlab\watcom\binw;$env:PATH" +Set-Item -Force -Path "env:INCLUDE" -Value "$pwdpath\.gitlab\watcom\h;$pwdpath\.gitlab\watcom\h\nt" +Set-Item -Force -Path "env:EDPATH" -Value "$pwdpath\.gitlab\watcom\eddat" +Set-Item -Force -Path "env:WATCOM" -Value "$pwdpath\.gitlab\watcom" +Set-Item -Force -Path "env:WLINKTMP" -Value "." diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index ded3e659ff..efce201dbf 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -431,19 +431,3 @@ - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake interruptible: true - -.cmake_test_windows_openwatcom: - stage: test-ext - - script: - - . .gitlab/ci/env.ps1 - - Invoke-Expression -Command .gitlab/ci/openwatcom.ps1 - - $pwdpath = $pwd.Path - - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\watcom\binnt;$pwdpath\.gitlab\watcom\binw;$env:PATH" - - Set-Item -Force -Path "env:INCLUDE" -Value "$pwdpath\.gitlab\watcom\h;$pwdpath\.gitlab\watcom\h\nt" - - Set-Item -Force -Path "env:EDPATH" -Value "$pwdpath\.gitlab\watcom\eddat" - - Set-Item -Force -Path "env:WATCOM" -Value "$pwdpath\.gitlab\watcom" - - Set-Item -Force -Path "env:WLINKTMP" -Value "." - - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake - - interruptible: true |