From 16b55e67601d77964181b6c07a8caa26e5060a92 Mon Sep 17 00:00:00 2001 From: Nikos Psaromanolakis Date: Thu, 23 Jul 2026 11:10:41 +0000 Subject: [PATCH] fix: Edit .gitlab-ci.yml --- .gitlab-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 820c260..11c21b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -380,6 +380,15 @@ update_values: git status git push -f "https://${GITLAB_USER_NAME}:${GROUP_ACCESS_TOKEN}@labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.ops/installer.git" HEAD:develop + + git checkout gitops-cd + git pull origin gitops-cd + git fetch origin develop + git merge origin/develop -m "Merge changes from develop" + + git status + git push -f "https://${GITLAB_USER_NAME}:${GROUP_ACCESS_TOKEN}@labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.ops/installer.git" HEAD:gitops-cd + else echo "No changes to commit." fi -- GitLab