diff options
| author | Brad King <brad.king@kitware.com> | 2023-04-05 10:43:03 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-04-05 10:47:05 -0400 |
| commit | e2cf20e58c1e5c96c977d647460cdcce92abeb57 (patch) | |
| tree | fa0570d1db7d7dacc41fb175b913537a827256e2 /.gitlab | |
| parent | 8af9a52d3e9d9965f306099afc288b86db99e748 (diff) | |
| download | cmake-e2cf20e58c1e5c96c977d647460cdcce92abeb57.tar.gz | |
ci: De-duplicate Windows test script for Borland jobs
Move job-specific setup to environment scripts.
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci/borland-env.ps1 | 3 | ||||
| -rwxr-xr-x | .gitlab/ci/env_windows_borland5.5.ps1 | 1 | ||||
| -rwxr-xr-x | .gitlab/ci/env_windows_borland5.8.ps1 | 1 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 12 |
4 files changed, 5 insertions, 12 deletions
diff --git a/.gitlab/ci/borland-env.ps1 b/.gitlab/ci/borland-env.ps1 new file mode 100755 index 0000000000..b3b532e37c --- /dev/null +++ b/.gitlab/ci/borland-env.ps1 @@ -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" diff --git a/.gitlab/ci/env_windows_borland5.5.ps1 b/.gitlab/ci/env_windows_borland5.5.ps1 new file mode 100755 index 0000000000..0d2e46b67f --- /dev/null +++ b/.gitlab/ci/env_windows_borland5.5.ps1 @@ -0,0 +1 @@ +. .gitlab/ci/borland-env.ps1 diff --git a/.gitlab/ci/env_windows_borland5.8.ps1 b/.gitlab/ci/env_windows_borland5.8.ps1 new file mode 100755 index 0000000000..0d2e46b67f --- /dev/null +++ b/.gitlab/ci/env_windows_borland5.8.ps1 @@ -0,0 +1 @@ +. .gitlab/ci/borland-env.ps1 diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 34abb295d1..b932b7431a 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -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 |