From ab4a9195ef54e55452ba4147acd599ddd6bc1685 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Sun, 28 Nov 2021 18:28:42 +0000
Subject: [PATCH] Combine daily and on-push build declarations

This means there'll always be a job of a predictable name in the last
successful pipeline for the master branch, and we can have static URLs
again.
---
 .gitlab-ci.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 47511923ad..47b30c38f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -395,21 +395,15 @@ 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: true
 
 Windows_MSBuild_Engine_Debug:
   extends: