From 967456423b8bcc4f833c897140339e62ceb7bcb5 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 5 Apr 2023 14:25:04 -0400 Subject: ci: Factor out initial setup script for Windows external test jobs On Linux and macOS we use the "before script" for both build and test jobs. On Windows we only want a subset of it, but give it a dedicated helper for consistency. --- .gitlab/os-windows.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '.gitlab') diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index aa817d0cf1..c7ee28b3ef 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -349,6 +349,9 @@ - . .gitlab/ci/qt-env.ps1 - . .gitlab/ci/python-env.ps1 +.before_script_windows_external: &before_script_windows_external + - . .gitlab/ci/env.ps1 + .cmake_build_windows: stage: build @@ -381,7 +384,7 @@ stage: test-ext script: - - . .gitlab/ci/env.ps1 + - *before_script_windows_external - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_standalone.cmake interruptible: true -- cgit v1.2.1