From 541b952233414ad9b35b17b155c219ae5d301668 Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Mon, 22 Jan 2024 19:46:08 +0000
Subject: [PATCH] used rebase to avoid pushed branch behind remote error
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da5d71dc..86f20269 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@ pages:
- git fetch origin $PAGES_BRANCH && git checkout -b $PAGES_BRANCH origin/$PAGES_BRANCH || git checkout $PAGES_BRANCH || echo "Pages branch not deployed yet."
- git checkout $CI_COMMIT_SHA
script:
+ - git pull origin $PAGES_BRANCH --rebase
- >
if [ -n "$CI_COMMIT_TAG" ]; then
mike deploy --deploy-prefix public -r $HTTPS_REMOTE -p -b $PAGES_BRANCH -u $CI_COMMIT_TAG $CI_COMMIT_TAG
--
GitLab