From 795bb0bb98dd54b553aaae5e6fca12719e576149 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 13 Mar 2024 14:11:51 +0000 Subject: [PATCH] Switch from MSBuild to Ninja for default Windows job It should be way faster now CCache is working --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4088024289..0dac890e17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -854,13 +854,17 @@ macOS15_Xcode16_arm64: - job: "Windows_Ninja_Debug" artifacts: true -.Windows_Ninja_RelWithDebInfo: +Windows_Ninja_RelWithDebInfo: extends: - .Windows_Ninja_Base variables: 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" .Windows_Ninja_RelWithDebInfo_GroupOne: extends: @@ -892,7 +896,7 @@ macOS15_Xcode16_arm64: - job: "Windows_Ninja_RelWithDebInfo_GroupTwo" artifacts: true -.Windows_Ninja_CacheInit: +Windows_Ninja_CacheInit: # currently, Windows jobs for all configs share the same cache key as we only cache the dependencies extends: - .Windows_Ninja_Base @@ -1032,10 +1036,6 @@ 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" Windows_MSBuild_RelWithDebInfo_GroupOne: extends: