From 11768bb526f560f4916093b0bf8a6a5b4d90467e Mon Sep 17 00:00:00 2001 From: Philip Makedonski Date: Wed, 10 Jan 2024 21:36:43 +0100 Subject: [PATCH] + fixes for prepare and CI scripts --- .gitlab-ci.yml | 2 +- prepare.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a14072a..68aac65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -256,7 +256,7 @@ pages: - chmod +x prepare.sh - ./prepare.sh $RELEASE_BASE_URL $RELEASE_KEY $SITE_PATH $RELEASE_BASE_PATH - cp -r -f $SITE_PATH/* $RELEASE_PATH - - find $RELEASE_BASE + - find $RELEASE_BASE_PATH # Zip the content and publish the zip again #- zip -r "content.zip" "public" #- mv "content.zip" "public/" diff --git a/prepare.sh b/prepare.sh index 569e55e..519451d 100755 --- a/prepare.sh +++ b/prepare.sh @@ -43,6 +43,9 @@ process_contents() { cp -r -f $channel/* $RELEASE_BASE_PATH/$channel } +# update contents +update_contents "$SITE_PATH" + # process opposite channel if [ "$TARGET_CHANNEL" == "beta" ]; then process_contents "main" @@ -50,8 +53,6 @@ else process_contents "beta" fi -# update contents -update_contents "$SITE_PATH" # Debugging # BASE_URL="https://top.etsi.org/top-extras/updatesite" -- GitLab