[gnome-shell/wip/fmuellner/more-ci] ci: Fail



commit ddfb4a449ff1667216f9ea2cd7cd8617c05f99fc
Author: Florian Müllner <fmuellner gnome org>
Date:   Sat Feb 16 17:00:59 2019 +0100

    ci: Fail

 .gitlab-ci.yml                | 2 +-
 .gitlab-ci/checkout-mutter.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d23cb00c..035a6bbbc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ build:
     image: registry.gitlab.gnome.org/gnome/gnome-shell/master:v1
     stage: build
     before_script:
-        - .gitlab-ci/checkout-mutter.sh
+        - .gitlab-ci/checkout-mutter.sh && false
         - meson mutter mutter/build --prefix=/usr -Dtests=false
         - ninja -C mutter/build install
     script:
diff --git a/.gitlab-ci/checkout-mutter.sh b/.gitlab-ci/checkout-mutter.sh
index fab2a68d9..69f57a27f 100755
--- a/.gitlab-ci/checkout-mutter.sh
+++ b/.gitlab-ci/checkout-mutter.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/bash -w
+#!/usr/bin/bash -x
 
 shell_branch=$(git describe --contains --all HEAD)
 mutter_target=
@@ -23,7 +23,7 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
 fi
 
 if [ -z "$mutter_target" ]; then
-  mutter_target=$(git branch -r -l origin/$shell_branch)
+  mutter_target=$(git branch -r -l $shell_branch)
   mutter_target=${mutter_target:-origin/master}
   echo Using $mutter_target instead
 fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]