From ef180c1be645a9a2742416852b153083fc023440 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Tue, 29 Jun 2021 10:39:00 -0700
Subject: [PATCH] GitLab CI: Add a "merged" rule for dedicated runners.

We have to use dedicated runners for Windows builds, so create a
separate "if-merged" rule for them which includes only the
wireshark/wireshark repository.
---
 .gitlab-ci.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6b16df436..b44b0b42b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,13 +50,21 @@ variables:
     when: always
   - if: '$CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_URL !~ /.*gitlab.com\/wireshark\/wireshark/'
     when: manual
+# Merged commits for runners which are only available in
+# wireshark/wireshark, e.g. wireshark-windows-*. Run automatically in
+# the main repo and allow manual runs in the web UI.
+.if-w-w-only-merged:
+  - if: '$CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_URL =~ /.*gitlab.com\/wireshark\/wireshark/'
+    when: always
+  - if: '$CI_PIPELINE_SOURCE == "web"'
+    when: always
 # Incoming merge requests.
 .if-merge-request:
   - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
     when: always
 # Incoming non-detached merge requests. Must be used for runners which are only
 # available in wireshark/wireshark, e.g. wireshark-windows-*
-.if-attached-merge-request:
+.if-w-w-only-merge-request:
   - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_URL =~ /.*gitlab.com\/wireshark\/wireshark/'
     when: always
 # Daily jobs. Care should be taken when changing this since the scheduler
@@ -295,7 +303,7 @@ Debian Stable APT Test:
 
 Win64 Package:
   extends: .build-windows
-  rules: !reference [.if-merged]
+  rules: !reference [.if-w-w-only-merged]
   tags:
     - wireshark-win64-package
   before_script:
@@ -341,7 +349,7 @@ Win64 Package:
 
 Win32 Package:
   extends: .build-windows
-  rules: !reference [.if-merged]
+  rules: !reference [.if-w-w-only-merged]
   tags:
     - wireshark-win32-package
   before_script:
@@ -517,7 +525,7 @@ Code Checks + Clang Warnings:
 # https://docs.gitlab.com/ee/user/gitlab_com/index.html#windows-shared-runners-beta
 Windows Build:
   extends: .build-windows
-  rules: !reference [.if-attached-merge-request]
+  rules: !reference [.if-w-w-only-merge-request]
   tags:
     - wireshark-windows-merge-req
   script: