From b1a485dadef9b2c28086cd88191fcb1ae786d2e7 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 14 Jun 2022 12:14:33 +0200
Subject: [PATCH] Ninja Windows Build Combined

---
 .gitlab-ci.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b012e07440..c03632d5ad 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
@@ -420,6 +423,13 @@ variables: &tests-targets
   # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
   timeout: 2h
 
+Windows_Ninja_RelWithDebInfo:
+  extends:
+    - .Windows_Ninja_Base
+  variables:
+    <<: *combined-targets
+    config: "RelWithDebInfo"
+
 .Windows_Ninja_Engine_Release:
   extends:
     - .Windows_Ninja_Base
@@ -574,7 +584,7 @@ variables: &tests-targets
     <<: *engine-targets
     config: "Debug"
 
-Windows_MSBuild_Engine_RelWithDebInfo:
+.Windows_MSBuild_Engine_RelWithDebInfo:
   extends:
     - .Windows_MSBuild_Base
   variables:
@@ -599,7 +609,7 @@ Windows_MSBuild_Engine_RelWithDebInfo:
     <<: *cs-targets
     config: "Debug"
 
-Windows_MSBuild_CS_RelWithDebInfo:
+.Windows_MSBuild_CS_RelWithDebInfo:
   extends:
     - .Windows_MSBuild_Base
   variables: