diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21e24de0f35298fadd18e65a75853c61e29d1ad4..cebcbeecdc723f13626029a3402168e113d4ce58 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}" @@ -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? -> remove content in release path? # 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: