diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2021-10-01 10:03:49 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2021-10-01 10:12:17 -0400 |
| commit | cfdb89b8a757bad7e2529a4ed3be4e0373a2f7c5 (patch) | |
| tree | bd3459788dae37e7ba0a278b89c78a074a52e799 | |
| parent | 4401e346a7517614d9ff51bdaec5adaaf55c2f5e (diff) | |
| download | libnice-cfdb89b8a757bad7e2529a4ed3be4e0373a2f7c5.tar.gz | |
gitlab-ci: Update ci-fairy to upstream recommended script
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f71160f..c787832 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,3 @@ -include: - - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/7ea696055e322cc7aa4bcbe5422b56a198c4bdff/templates/ci-fairy.yml" - stages: - verify - build @@ -18,15 +15,21 @@ default: # # Check "allow-edit" checkbox on merge requests with ci-fairy # -check allow-edit: - extends: '.fdo.ci-fairy' + +include: + - project: 'freedesktop/ci-templates' + file: '/templates/ci-fairy.yml' + +check-allow-collaboration: + extends: + - .fdo.ci-fairy + script: + - ci-fairy check-merge-request --require-allow-collaboration interruptible: true needs: [] stage: 'verify' variables: GIT_STRATEGY: 'none' - script: - - ci-fairy check-merge-request --require-allow-collaboration rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' when: always |