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 Borland jobs

Browse Source 
Move job-specific setup to environment scripts.
This commit is contained in:
Brad King
2023-04-05 10:47:05 -04:00
parent 8af9a52d3e
commit e2cf20e58c
5 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+2 -2
View File
@@ -1079,7 +1079,7 @@ t:windows-vs2022-x64-jom:
t:windows-borland5.5:
extends:
- .windows_borland5.5
- .cmake_test_windows_borland
- .cmake_test_windows_external
- .windows_x86_64_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
@@ -1093,7 +1093,7 @@ t:windows-borland5.5:
t:windows-borland5.8:
extends:
- .windows_borland5.8
- .cmake_test_windows_borland
- .cmake_test_windows_external
- .windows_x86_64_tags_concurrent
- .cmake_junit_artifacts
- .run_dependent
.gitlab/ci/borland-env.ps1
Executable
+3
View File
@@ -0,0 +1,3 @@
Invoke-Expression -Command .gitlab/ci/borland.ps1
$pwdpath = $pwd.Path
Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\bcc\bin;$env:PATH"
.gitlab/ci/env_windows_borland5.5.ps1
Executable
+1
View File
@@ -0,0 +1 @@
. .gitlab/ci/borland-env.ps1
.gitlab/ci/env_windows_borland5.8.ps1
Executable
+1
View File
@@ -0,0 +1 @@
. .gitlab/ci/borland-env.ps1
.gitlab/os-windows.yml
-12
View File
@@ -408,15 +408,3 @@
- build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake
interruptible: true
.cmake_test_windows_borland:
stage: test-ext
script:
- . .gitlab/ci/env.ps1
- Invoke-Expression -Command .gitlab/ci/borland.ps1
- $pwdpath = $pwd.Path
- Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\bcc\bin;$env:PATH"
- build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake
interruptible: true