mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-10 12:55:48 +01:00
ci: Run the fedora CI job on merges as well as branches
Since it now has to build the docs (and code coverage) for `main`, that needs to happen after branches are merged. Other jobs remain not-run on merges. Signed-off-by: Philip Withnall <pwithnall@gnome.org> Helps: #3037
This commit is contained in:
parent
5400094ab0
commit
2a1be27431
@ -33,6 +33,15 @@ variables:
|
|||||||
variables:
|
variables:
|
||||||
- $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE == "GNOME"
|
- $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE == "GNOME"
|
||||||
|
|
||||||
|
# As above, but does get executed on merge into `origin/main`. For use with
|
||||||
|
# updating code coverage results and docs builds.
|
||||||
|
.only-default-and-merges:
|
||||||
|
only:
|
||||||
|
- branches
|
||||||
|
except:
|
||||||
|
refs:
|
||||||
|
- tags
|
||||||
|
|
||||||
# Some jobs run on CI runners which don’t have good isolation between CI jobs,
|
# Some jobs run on CI runners which don’t have good isolation between CI jobs,
|
||||||
# and don’t have much available resource. Limit those jobs to only ones on the
|
# and don’t have much available resource. Limit those jobs to only ones on the
|
||||||
# origin repository (GNOME/glib), rather than people’s forks. Code in the origin
|
# origin repository (GNOME/glib), rather than people’s forks. Code in the origin
|
||||||
@ -103,7 +112,7 @@ style-check-mandatory:
|
|||||||
fedora-x86_64:
|
fedora-x86_64:
|
||||||
extends:
|
extends:
|
||||||
- .build-linux
|
- .build-linux
|
||||||
- .only-default
|
- .only-default-and-merges
|
||||||
image: $FEDORA_IMAGE
|
image: $FEDORA_IMAGE
|
||||||
stage: build
|
stage: build
|
||||||
needs: []
|
needs: []
|
||||||
|
Loading…
x
Reference in New Issue
Block a user