Kaynağa Gözat

ci: De-duplicate Windows test script for Borland jobs

Move job-specific setup to environment scripts.
Brad King 2 yıl önce
ebeveyn
işleme
e2cf20e58c

+ 2 - 2
.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

+ 3 - 0
.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"

+ 1 - 0
.gitlab/ci/env_windows_borland5.5.ps1

@@ -0,0 +1 @@
+. .gitlab/ci/borland-env.ps1

+ 1 - 0
.gitlab/ci/env_windows_borland5.8.ps1

@@ -0,0 +1 @@
+. .gitlab/ci/borland-env.ps1

+ 0 - 12
.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