diff options
| author | Daniel Stone <daniels@collabora.com> | 2021-08-03 21:13:25 +0100 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2021-08-04 18:16:59 +0100 |
| commit | e4deb4dc66560cf17e85745fe8aa0e35bfa4f4b3 (patch) | |
| tree | 2b7146ba4d2f20b2b9c42083b4aef175473e4887 /.gitlab-ci.yml | |
| parent | ci: Add ARMv7 build (diff) | |
| download | wayland-e4deb4dc66560cf17e85745fe8aa0e35bfa4f4b3.tar wayland-e4deb4dc66560cf17e85745fe8aa0e35bfa4f4b3.tar.gz wayland-e4deb4dc66560cf17e85745fe8aa0e35bfa4f4b3.tar.bz2 wayland-e4deb4dc66560cf17e85745fe8aa0e35bfa4f4b3.tar.lz wayland-e4deb4dc66560cf17e85745fe8aa0e35bfa4f4b3.tar.xz wayland-e4deb4dc66560cf17e85745fe8aa0e35bfa4f4b3.tar.zst wayland-e4deb4dc66560cf17e85745fe8aa0e35bfa4f4b3.zip | |
ci: Only run ci-fairy on MRs
This requires adding rules to all the jobs, as it's all or nothing.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73f7618..7e35639 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,6 +68,9 @@ stages: - "Base container" - "Build and test" +.ci-rules: + rules: + - when: on_success # Base variables used for anything using a Debian environment .os-debian: @@ -96,10 +99,15 @@ stages: BUILD_ARCH: "armv7" +# Does not inherit .ci-rules as we only want it to run in MR context. check-commit: extends: - .fdo.ci-fairy stage: "Merge request checks" + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + when: always + - when: never script: - ci-fairy check-commits --signed-off-by --junit-xml=results.xml variables: @@ -114,6 +122,7 @@ check-commit: # stage. x86_64-debian-container_prep: extends: + - .ci-rules - .debian-x86_64 - .fdo.container-build@debian stage: "Base container" @@ -122,6 +131,7 @@ x86_64-debian-container_prep: aarch64-debian-container_prep: extends: + - .ci-rules - .debian-aarch64 - .fdo.container-build@debian tags: @@ -132,6 +142,7 @@ aarch64-debian-container_prep: armv7-debian-container_prep: extends: + - .ci-rules - .debian-armv7 - .fdo.container-build@debian tags: @@ -193,6 +204,8 @@ armv7-debian-container_prep: # Full build and test. .do-build: + extends: + - .ci-rules stage: "Build and test" script: - cd "$BUILDDIR" |