From 652d89e7479205d1046c3f0f23a53386fd7bc4f4 Mon Sep 17 00:00:00 2001
From: Philip Makedonski <makedonski@cs.uni-goettingen.de>
Date: Mon, 30 Oct 2023 16:01:10 +0100
Subject: [PATCH 1/3] + maintain separate release channels through archives

---
 .gitlab-ci.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21e24de0..d511ed59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -228,21 +228,22 @@ pages:
     - job: build-job
       artifacts: true
   script:
-    # Get the previous GitLab Pages content
-    # - set +e
-    # - curl --fail "$CI_PAGES_URL/content.zip" -o "content.zip"
-    # - if [ -e "content.zip" ]; then unzip "content.zip"; rm "content.zip"; fi
-    # - set -e
+    # Get the previous GitLab Pages content (otherwise other beta/stable branch gets removed..)
+    - set +e
+    - curl --fail "$CI_PAGES_URL/content.zip" -o "content.zip"
+    - if [ -e "content.zip" ]; then unzip "content.zip"; rm "content.zip"; fi
+    - set -e
+    - ls -la $RELEASE_PATH
+    # Cleanup content?
     # Add/update content
-    # TODO: differentiate on branch?
     - echo $CI_PAGES_URL
     - echo $RELEASE_PATH
     - mkdir -p $RELEASE_PATH
     - cp -r -f $SITE_PATH/* $RELEASE_PATH
     - ls -la $RELEASE_PATH
     # Zip the content and publish the zip again
-    # - zip -r "content.zip" "public"
-    # - mv "content.zip" "public/"
+    - zip -r "content.zip" "public"
+    - mv "content.zip" "public/"
     # - mv $SITE_ARCHIVE $RELEASE_PATH/content.zip
   artifacts:
     paths:
-- 
GitLab


From f518c73713f3b5c0e5aa384bb270532c91b82066 Mon Sep 17 00:00:00 2001
From: Philip Makedonski <makedonski@cs.uni-goettingen.de>
Date: Mon, 30 Oct 2023 16:03:41 +0100
Subject: [PATCH 2/3] * CI script fixes

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d511ed59..9eb15aff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ variables:
   TTF_CI_TARGET_BRANCH: "ttf-034"  
   DEV_CI_TARGET_BRANCH: "dev"
   MAIN_CI_TARGET_BRANCH: "master"
-  CI_TARGET_BRANCH: ${TTF_CI_TARGET_BRANCH}
+  CI_TARGET_BRANCH: "${TTF_CI_TARGET_BRANCH}"
   SITE_LOCATION: "updatesite/org.etsi.mts.tdl.updatesite/target"
   ARCHIVE_NAME: "org.etsi.mts.tdl.updatesite-1.0.0-SNAPSHOT.zip"
   SITE_ARCHIVE: "${SITE_LOCATION}/${ARCHIVE_NAME}"
-- 
GitLab


From 969eef0c22369daab27d52d639b957175853959e Mon Sep 17 00:00:00 2001
From: Philip Makedonski <makedonski@cs.uni-goettingen.de>
Date: Mon, 30 Oct 2023 16:17:23 +0100
Subject: [PATCH 3/3] * trigger CI?

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9eb15aff..cebcbeec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -234,7 +234,7 @@ pages:
     - if [ -e "content.zip" ]; then unzip "content.zip"; rm "content.zip"; fi
     - set -e
     - ls -la $RELEASE_PATH
-    # Cleanup content?
+    # Cleanup content? -> remove content in release path?
     # Add/update content
     - echo $CI_PAGES_URL
     - echo $RELEASE_PATH
-- 
GitLab