gitlab CI: move the MR check to the deploy 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 85d923c40d2f2441a7c2871b3933e4d91f61864c..5a4f86c55e97f63cb9f0176e5eddc1eb10f52192 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -172,7 +172,7 @@ check-commit:
 
 check-merge-request:
   image: golang:alpine
-  stage: prep
+  stage: deploy
   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 2295e5596e128e21dac19774f44c7dba3e92f18d..afed01b572758ed00c366f712f0524d89bd8351e 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -168,7 +168,7 @@ check-commit:
 
 check-merge-request:
   image: golang:alpine
-  stage: prep
+  stage: deploy
   before_script:
     - apk add python3 py-pip git
     - pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates