mirror of
https://github.com/OpenMW/openmw.git
synced 2026-01-24 13:00:54 +00:00
Make MSBuild the default again
The ccache branches only made Ninja the default when ccache couldn't work with MSBuild.
This commit is contained in:
parent
3e016709b4
commit
777ac2aaa6
1 changed files with 18 additions and 18 deletions
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Reference in a new issue