From b64c93897be6aa0f3301469593abbe8e2e01f7ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Fri, 6 Nov 2020 18:07:07 +0100
Subject: [PATCH] ci: Wait for 'check-commit-log' before continuing

The check-commit-log is quick, and to get a result early is helpful as
one can then more quickly check for failures via the report provided via
the JUnit report.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/141>
---
 .gitlab-ci.yml                 | 5 ++---
 .gitlab-ci/check-commit-log.sh | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0617a691..2ed165c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,8 +19,7 @@ check_commit_log:
     stage: review
     script:
         - ./.gitlab-ci/check-commit-log.sh
-    only:
-        - merge_requests
+    <<: *only_default
     artifacts:
         expire_in: 1 week
         paths:
@@ -52,7 +51,7 @@ eslint:
 
 build-bundles:
   stage: build
-  needs: []
+  needs: ["check_commit_log"]
   script:
     - ./export-zips.sh
   <<: *only_default
diff --git a/.gitlab-ci/check-commit-log.sh b/.gitlab-ci/check-commit-log.sh
index 7cc5b289..00fd8938 100755
--- a/.gitlab-ci/check-commit-log.sh
+++ b/.gitlab-ci/check-commit-log.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 if [ -z "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
-  echo Cannot review non-merge request
-  exit 1
+  echo This is not a merge request, skipping
+  exit 0
 fi
 
 git fetch $CI_MERGE_REQUEST_PROJECT_URL.git $CI_MERGE_REQUEST_TARGET_BRANCH_NAME