From 79b9d810d06778c22bac094becf9f2e270a2f55f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Wed, 25 Aug 2021 11:09:01 +0200
Subject: [PATCH] MAINT: use correct branch in pipeline
---
.docker/install_cpplib.sh | 2 ++
.gitlab-ci.yml | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.docker/install_cpplib.sh b/.docker/install_cpplib.sh
index 484938f..35eb745 100755
--- a/.docker/install_cpplib.sh
+++ b/.docker/install_cpplib.sh
@@ -5,8 +5,10 @@ cd caosdb-cpplib
# check if there is a crooesponding cpp branch. Use the default branch
# if there isn't.
if (git show-ref --verify --quiet refs/heads/$CI_COMMIT_REF_NAME) ; then
+ echo "git checkout $CI_COMMIT_REF_NAME"
git checkout $CI_COMMIT_REF_NAME
else
+ echo "git checkout $CPP_DEFAULT_BRANCH"
git checkout $CPP_DEFAULT_BRANCH
fi
git submodule update --init --recursive
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07b49a6..b58f19c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ variables:
# The defalt branch to use with caosdb-cpplib
# TODO: Change back to dev once f-consolidate-c has been merged.
- CPP_DEFAULT_BRANCH: f-consolidate-c
+ CPP_DEFAULT_BRANCH: dev
image: $JULIALIB_REGISTRY_IMAGE
--
GitLab