mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-27 04:09:36 +03:00
Code Activity

ci: De-duplicate Windows test script for OpenWatcom job

Browse Source 
Move job-specific setup to an environment script.
This commit is contained in:
Brad King
2023-04-05 10:46:15 -04:00
parent eb2bdbd301
commit 430aa379d4
4 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+1 -1
View File
@@ -1209,7 +1209,7 @@ t:windows-msvc-v71-nmake:
t:windows-openwatcom1.9:
extends:
- .windows_openwatcom1.9
- .cmake_test_windows_openwatcom
- .cmake_test_windows_external
- .windows_x86_64_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
.gitlab/ci/env_windows_openwatcom1.9.ps1
Executable
+1
View File
@@ -0,0 +1 @@
. .gitlab/ci/openwatcom-env.ps1
.gitlab/ci/openwatcom-env.ps1
Executable
+7
View File
@@ -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 "."
.gitlab/os-windows.yml
-16
View File
@@ -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