From e2cf20e58c1e5c96c977d647460cdcce92abeb57 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 5 Apr 2023 10:43:03 -0400
Subject: ci: De-duplicate Windows test script for Borland jobs

Move job-specific setup to environment scripts.
---
 .gitlab-ci.yml                        |  4 ++--
 .gitlab/ci/borland-env.ps1            |  3 +++
 .gitlab/ci/env_windows_borland5.5.ps1 |  1 +
 .gitlab/ci/env_windows_borland5.8.ps1 |  1 +
 .gitlab/os-windows.yml                | 12 ------------
 5 files changed, 7 insertions(+), 14 deletions(-)
 create mode 100755 .gitlab/ci/borland-env.ps1
 create mode 100755 .gitlab/ci/env_windows_borland5.5.ps1
 create mode 100755 .gitlab/ci/env_windows_borland5.8.ps1

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ec100c..aa3b699 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/.gitlab/ci/borland-env.ps1 b/.gitlab/ci/borland-env.ps1
new file mode 100755
index 0000000..b3b532e
--- /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 0000000..0d2e46b
--- /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 0000000..0d2e46b
--- /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 34abb29..b932b74 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
-- 
cgit v0.12