diff options
| author | Gerald Combs <gerald@wireshark.org> | 2021-06-29 10:39:00 -0700 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-06-29 19:32:51 +0000 |
| commit | ef180c1be645a9a2742416852b153083fc023440 (patch) | |
| tree | b49c10cf42b95c64ba693ffaa51664346f02c18b /.gitlab-ci.yml | |
| parent | 06aa393df507d8f952f386a326d8c1967ae8cdf5 (diff) | |
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.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files 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: |