diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47511923ad..349bb5ffa3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -395,21 +395,16 @@ Windows_Ninja_Tests_RelWithDebInfo: - MSVC2019_64/*/*/*/*/*/*/*.log - MSVC2019_64/*/*/*/*/*/*/*/*.log -Daily_Windows_MSBuild_Engine_Release:on-schedule: - extends: - - .Windows_MSBuild_Base - variables: - <<: *engine-targets - config: "Release" - rules: - - if: $CI_PIPELINE_SOURCE == "schedule" - Windows_MSBuild_Engine_Release: extends: - .Windows_MSBuild_Base variables: <<: *engine-targets config: "Release" + rules: + # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it + - if: $CI_PIPELINE_SOURCE == "push" + - if: $CI_PIPELINE_SOURCE == "schedule" Windows_MSBuild_Engine_Debug: extends: @@ -431,6 +426,10 @@ Windows_MSBuild_CS_Release: variables: <<: *cs-targets config: "Release" + rules: + # run this for both pushes and schedules so 'latest successful pipeline for branch' always includes it + - if: $CI_PIPELINE_SOURCE == "push" + - if: $CI_PIPELINE_SOURCE == "schedule" Windows_MSBuild_CS_Debug: extends: