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>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bfd1f7..eeaee26 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index c923a9e..aa7e90c 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -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