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>
This commit is contained in:
parent
c4865c774b
commit
e4deb4dc66
|
@ -68,6 +68,9 @@ stages:
|
||||||
- "Base container"
|
- "Base container"
|
||||||
- "Build and test"
|
- "Build and test"
|
||||||
|
|
||||||
|
.ci-rules:
|
||||||
|
rules:
|
||||||
|
- when: on_success
|
||||||
|
|
||||||
# Base variables used for anything using a Debian environment
|
# Base variables used for anything using a Debian environment
|
||||||
.os-debian:
|
.os-debian:
|
||||||
|
@ -96,10 +99,15 @@ stages:
|
||||||
BUILD_ARCH: "armv7"
|
BUILD_ARCH: "armv7"
|
||||||
|
|
||||||
|
|
||||||
|
# Does not inherit .ci-rules as we only want it to run in MR context.
|
||||||
check-commit:
|
check-commit:
|
||||||
extends:
|
extends:
|
||||||
- .fdo.ci-fairy
|
- .fdo.ci-fairy
|
||||||
stage: "Merge request checks"
|
stage: "Merge request checks"
|
||||||
|
rules:
|
||||||
|
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
|
||||||
|
when: always
|
||||||
|
- when: never
|
||||||
script:
|
script:
|
||||||
- ci-fairy check-commits --signed-off-by --junit-xml=results.xml
|
- ci-fairy check-commits --signed-off-by --junit-xml=results.xml
|
||||||
variables:
|
variables:
|
||||||
|
@ -114,6 +122,7 @@ check-commit:
|
||||||
# stage.
|
# stage.
|
||||||
x86_64-debian-container_prep:
|
x86_64-debian-container_prep:
|
||||||
extends:
|
extends:
|
||||||
|
- .ci-rules
|
||||||
- .debian-x86_64
|
- .debian-x86_64
|
||||||
- .fdo.container-build@debian
|
- .fdo.container-build@debian
|
||||||
stage: "Base container"
|
stage: "Base container"
|
||||||
|
@ -122,6 +131,7 @@ x86_64-debian-container_prep:
|
||||||
|
|
||||||
aarch64-debian-container_prep:
|
aarch64-debian-container_prep:
|
||||||
extends:
|
extends:
|
||||||
|
- .ci-rules
|
||||||
- .debian-aarch64
|
- .debian-aarch64
|
||||||
- .fdo.container-build@debian
|
- .fdo.container-build@debian
|
||||||
tags:
|
tags:
|
||||||
|
@ -132,6 +142,7 @@ aarch64-debian-container_prep:
|
||||||
|
|
||||||
armv7-debian-container_prep:
|
armv7-debian-container_prep:
|
||||||
extends:
|
extends:
|
||||||
|
- .ci-rules
|
||||||
- .debian-armv7
|
- .debian-armv7
|
||||||
- .fdo.container-build@debian
|
- .fdo.container-build@debian
|
||||||
tags:
|
tags:
|
||||||
|
@ -193,6 +204,8 @@ armv7-debian-container_prep:
|
||||||
|
|
||||||
# Full build and test.
|
# Full build and test.
|
||||||
.do-build:
|
.do-build:
|
||||||
|
extends:
|
||||||
|
- .ci-rules
|
||||||
stage: "Build and test"
|
stage: "Build and test"
|
||||||
script:
|
script:
|
||||||
- cd "$BUILDDIR"
|
- cd "$BUILDDIR"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user