From f04ea4a7a833bbf2afa85eacd81aaa95c26cad63 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Mon, 13 Jun 2022 22:08:58 +0000 Subject: [PATCH] See if 1h time limit for Windows has been removed https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27771 has been closed and GitLab's published an update since --- .gitlab-ci.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b012e07440..25855bf913 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -344,6 +344,9 @@ variables: &tests-targets targets: "openmw_test_suite,openmw_detournavigator_navmeshtilescache_benchmark" package: "Tests" +variables: &combined-targets + targets: "openmw,openmw-iniimporter,openmw-launcher,openmw-wizard,openmw-navmeshtool,openmw-bulletobjecttool,openmw-cs,bsatool,esmtool,niftest,openmw-essimporter" + .Windows_Ninja_Base: tags: - windows @@ -574,7 +577,7 @@ variables: &tests-targets <<: *engine-targets config: "Debug" -Windows_MSBuild_Engine_RelWithDebInfo: +.Windows_MSBuild_Engine_RelWithDebInfo: extends: - .Windows_MSBuild_Base variables: @@ -599,13 +602,20 @@ Windows_MSBuild_Engine_RelWithDebInfo: <<: *cs-targets config: "Debug" -Windows_MSBuild_CS_RelWithDebInfo: +.Windows_MSBuild_CS_RelWithDebInfo: extends: - .Windows_MSBuild_Base variables: <<: *cs-targets config: "RelWithDebInfo" +Windows_MSBuild_Combined_RelWithDebInfo: + extends: + - .Windows_MSBuild_Base + variables: + <<: *combined-targets + config: "RelWithDebInfo" + .Windows_MSBuild_Tests_RelWithDebInfo: extends: .Windows_MSBuild_Base stage: build