gitlab CI: move MR check to a later stage

This gives the developer enough time to file an MR after pushing a branch.
Having this run in the first stage means we get false positives because no MR
has been filed yet when the job is run.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-06-30 10:51:11 +10:00
parent 94a09a40bd
commit 4c1b9f3c70
2 changed files with 4 additions and 2 deletions

View file

@ -40,6 +40,7 @@ stages:
- meson # distribution builds with meson
- tarballs # tarball builds
- container_clean # clean up unused container images
- merge-check # check for a merge request
variables:
# The upstrem repository we will check for images
@ -186,7 +187,7 @@ check-commit:
check-merge-request:
image: golang:alpine
stage: prep
stage: merge-check
before_script:
- apk add python3 py-pip git
- pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates

View file

@ -24,6 +24,7 @@ stages:
- meson # distribution builds with meson
- tarballs # tarball builds
- container_clean # clean up unused container images
- merge-check # check for a merge request
variables:
# The upstrem repository we will check for images
@ -123,7 +124,7 @@ check-commit:
check-merge-request:
image: golang:alpine
stage: prep
stage: merge-check
before_script:
- apk add python3 py-pip git
- pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates