forked from osmocom/wireshark
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.
This commit is contained in:
parent
06aa393df5
commit
ef180c1be6
|
@ -50,13 +50,21 @@ variables:
|
||||||
when: always
|
when: always
|
||||||
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_URL !~ /.*gitlab.com\/wireshark\/wireshark/'
|
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_URL !~ /.*gitlab.com\/wireshark\/wireshark/'
|
||||||
when: manual
|
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.
|
# Incoming merge requests.
|
||||||
.if-merge-request:
|
.if-merge-request:
|
||||||
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
|
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
|
||||||
when: always
|
when: always
|
||||||
# Incoming non-detached merge requests. Must be used for runners which are only
|
# Incoming non-detached merge requests. Must be used for runners which are only
|
||||||
# available in wireshark/wireshark, e.g. wireshark-windows-*
|
# 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/'
|
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_URL =~ /.*gitlab.com\/wireshark\/wireshark/'
|
||||||
when: always
|
when: always
|
||||||
# Daily jobs. Care should be taken when changing this since the scheduler
|
# Daily jobs. Care should be taken when changing this since the scheduler
|
||||||
|
@ -295,7 +303,7 @@ Debian Stable APT Test:
|
||||||
|
|
||||||
Win64 Package:
|
Win64 Package:
|
||||||
extends: .build-windows
|
extends: .build-windows
|
||||||
rules: !reference [.if-merged]
|
rules: !reference [.if-w-w-only-merged]
|
||||||
tags:
|
tags:
|
||||||
- wireshark-win64-package
|
- wireshark-win64-package
|
||||||
before_script:
|
before_script:
|
||||||
|
@ -341,7 +349,7 @@ Win64 Package:
|
||||||
|
|
||||||
Win32 Package:
|
Win32 Package:
|
||||||
extends: .build-windows
|
extends: .build-windows
|
||||||
rules: !reference [.if-merged]
|
rules: !reference [.if-w-w-only-merged]
|
||||||
tags:
|
tags:
|
||||||
- wireshark-win32-package
|
- wireshark-win32-package
|
||||||
before_script:
|
before_script:
|
||||||
|
@ -517,7 +525,7 @@ Code Checks + Clang Warnings:
|
||||||
# https://docs.gitlab.com/ee/user/gitlab_com/index.html#windows-shared-runners-beta
|
# https://docs.gitlab.com/ee/user/gitlab_com/index.html#windows-shared-runners-beta
|
||||||
Windows Build:
|
Windows Build:
|
||||||
extends: .build-windows
|
extends: .build-windows
|
||||||
rules: !reference [.if-attached-merge-request]
|
rules: !reference [.if-w-w-only-merge-request]
|
||||||
tags:
|
tags:
|
||||||
- wireshark-windows-merge-req
|
- wireshark-windows-merge-req
|
||||||
script:
|
script:
|
||||||
|
|
Loading…
Reference in New Issue