Let check_if_signed fail if git fails

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6ad5ec06490195521f8a1f1722c5dbe3a3c4892..ba7978cff446ab0538f8ee2cd73d02fb23a31919 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ commit-check:
     policy: pull
   script:
     # we want $ALPINE_BASE_BUILD without git, so add it here
-    - apk add git
+    - apk add git bash
     - devel/check_if_signed
   retry: 0
 

diff --git a/devel/check_if_signed b/devel/check_if_signed
index b8b4fef112b616a630fe9dadd61190c524a08fbf..3d05d4fcbb6dd772bf4b7e4316ee40b4cb8ae8bd 100755 (executable)
--- a/devel/check_if_signed
+++ b/devel/check_if_signed
@@ -1,7 +1,9 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+
+set -e
 
 if test -z "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"; then
-  CI_MERGE_REQUEST_TARGET_BRANCH_NAME="master"
+  CI_MERGE_REQUEST_TARGET_BRANCH_NAME="origin/master"
 fi
 
 echo "target=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"