From 0851f01594094a1fd0eb71d716d211535a9d2322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20KUBLER?= <gregoire.kubler@proton.me>
Date: Wed, 20 Mar 2024 16:38:53 +0100
Subject: [PATCH] fix : syntax error
---
.gitlab/ci/build.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab/ci/build.gitlab-ci.yml b/.gitlab/ci/build.gitlab-ci.yml
index b299e109..15fde5d1 100644
--- a/.gitlab/ci/build.gitlab-ci.yml
+++ b/.gitlab/ci/build.gitlab-ci.yml
@@ -13,7 +13,6 @@ build:ubuntu_cpp:
- DEPENDENCY_JOB="build:ubuntu_cpp"
# - !reference [.download_dependency, script]
- apt-get -qq install -y jq
- - BRANCH_TO_PULL="dev" # default branch
# Check if a branch with the same name exist on the dependance repository
- >
if [ "$CI_MERGE_REQUEST_ID" ]; then
@@ -26,11 +25,12 @@ build:ubuntu_cpp:
BRANCH_TO_PULL=${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}
fi
elif [ $(curl -s -o /dev/null -w "%{http_code}" "https://gitlab.eclipse.org/eclipse/aidge/$DEPENDENCY_NAME/-/tree/$CI_COMMIT_REF_NAME") -eq 404 ]; then
+ BRANCH_TO_PULL="dev" # default branch
else
# Pulling from branch with same name
BRANCH_TO_PULL=${CI_COMMIT_REF_NAME}
fi
- echo "Pull from branch : $BRANCH_TO_PULL"
+ - echo "Pull from branch : ${BRANCH_TO_PULL}"
# Check group namespace is valid, if it is then we are in the official project(aidge group id=6437), otherwise we pull from the fork
- >
set -x
--
GitLab