From 777ac2aaa63fdad70b6578f40858cf421abf8186 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Thu, 1 Jan 2026 19:07:08 +0000
Subject: [PATCH] Make MSBuild the default again

The ccache branches only made Ninja the default when ccache couldn't work with MSBuild.
---
 .gitlab-ci.yml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac0ebe5e1f..2475619c9a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -865,10 +865,22 @@ macOS15_Xcode16_arm64:
     config: "RelWithDebInfo"
     # Gitlab can't successfully execute following binaries due to unknown reason
     # executables: "components-tests.exe,openmw-tests.exe,openmw-cs-tests.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
-  # temporarily enabled while we're linking these on the downloads page
   rules:
-    # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
-    - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "schedule"
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+        paths:
+          - CMakeLists.txt
+          - "**/CMakeLists.txt"
+          - "**/*.cmake"
+          - "CI/*msvc*"
+    - if: $CI_PIPELINE_SOURCE == "push"
+      #changes:
+      #  paths:
+      #    - CMakeLists.txt
+      #    - "**/CMakeLists.txt"
+      #    - "**/*.cmake"
+      #    - "CI/*msvc*"
+      #  compare_to: the last time this job worked for a parent commit
 
 Windows_Ninja_RelWithDebInfo_GroupOne:
   extends:
@@ -1068,22 +1080,10 @@ Windows_Ninja_CacheInit:
     config: "RelWithDebInfo"
     # Gitlab can't successfully execute following binaries due to unknown reason
     # executables: "components-tests.exe,openmw-tests.exe,openmw-cs-tests.exe,openmw_detournavigator_navmeshtilescache_benchmark.exe"
+  # temporarily enabled while we're linking these on the downloads page
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-        paths:
-          - CMakeLists.txt
-          - "**/CMakeLists.txt"
-          - "**/*.cmake"
-          - "CI/*msvc*"
-    - if: $CI_PIPELINE_SOURCE == "push"
-      #changes:
-      #  paths:
-      #    - CMakeLists.txt
-      #    - "**/CMakeLists.txt"
-      #    - "**/*.cmake"
-      #    - "CI/*msvc*"
-      #  compare_to: the last time this job worked for a parent commit
+    # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it
+    - if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "schedule"
 
 Windows_MSBuild_RelWithDebInfo_GroupOne:
   extends: