summaryrefslogtreecommitdiffstats
path: root/.gitlab
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab')
-rwxr-xr-x.gitlab/ci/env_windows_clang_ninja.ps12
-rwxr-xr-x.gitlab/ci/env_windows_clang_nmake.ps11
-rw-r--r--.gitlab/os-windows.yml11
3 files changed, 3 insertions, 11 deletions
diff --git a/.gitlab/ci/env_windows_clang_ninja.ps1 b/.gitlab/ci/env_windows_clang_ninja.ps1
new file mode 100755
index 0000000..17002ef
--- /dev/null
+++ b/.gitlab/ci/env_windows_clang_ninja.ps1
@@ -0,0 +1,2 @@
+. .gitlab/ci/ninja-env.ps1
+. .gitlab/ci/clang-env.ps1
diff --git a/.gitlab/ci/env_windows_clang_nmake.ps1 b/.gitlab/ci/env_windows_clang_nmake.ps1
new file mode 100755
index 0000000..89fa360
--- /dev/null
+++ b/.gitlab/ci/env_windows_clang_nmake.ps1
@@ -0,0 +1 @@
+. .gitlab/ci/clang-env.ps1
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index 6f9c292..bb19de9 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -390,17 +390,6 @@
interruptible: true
-.cmake_test_windows_clang:
- stage: test-ext
-
- script:
- - . .gitlab/ci/env.ps1
- - . .gitlab/ci/ninja-env.ps1
- - . .gitlab/ci/clang-env.ps1
- - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake
-
- interruptible: true
-
.cmake_test_windows_msvc:
stage: test-ext