diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68aac6539a0daf0796419ec1d1b51e94783bd28f..85681df8342832491b9a484024a82dfe8f43edde 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ variables: SITE_LOCATION: "updatesite/org.etsi.mts.tdl.extras.updatesite/target" ARCHIVE_NAME: "org.etsi.mts.tdl.extras.updatesite-1.0.0-SNAPSHOT.zip" SITE_ARCHIVE: "${SITE_LOCATION}/${ARCHIVE_NAME}" - SITE_PATH: "${SITE_LOCATION}/repository/" + SITE_PATH: "${SITE_LOCATION}/repository" REPO_PREFIX: "https://labs.etsi.org/rep/top/top-extras/-/jobs" REPO_PATH: "artifacts/raw/updatesite/org.etsi.mts.tdl.extras.updatesite/target/repository/" PACKAGE_NAME: "TOP Extras Interim Build" diff --git a/prepare.sh b/prepare.sh index 519451d10dd726605db41bed632a0c189cf17d89..f093b33c4976754f58c8332a32e514865deb03a0 100755 --- a/prepare.sh +++ b/prepare.sh @@ -12,8 +12,9 @@ update_contents() { CLEAN=$(echo "$TARGET_PATH/" | sed 's/\//\\\//g') echo $CLEAN # Use the escaped variable in a sed command - echo "find . -type f | sed -e \"s|$CLEAN||g\" > \"$TARGET_PATH/content.txt\"" + echo "find $TARGET_PATH -type f | sed -e \"s|$CLEAN||g\" > \"$TARGET_PATH/content.txt\"" find $TARGET_PATH -type f | sed -e "s|$CLEAN||g" > "$TARGET_PATH/content.txt" + cat "$TARGET_PATH/content.txt" } process_contents() { @@ -36,8 +37,8 @@ process_contents() { mkdir -p `dirname "$line"` # get file curl "$BASE_URL/$channel/$line" -o "$channel/$line" - # update contents done < "$file" + # update contents update_contents $channel mkdir -p $RELEASE_BASE_PATH/$channel cp -r -f $channel/* $RELEASE_BASE_PATH/$channel @@ -48,7 +49,7 @@ update_contents "$SITE_PATH" # process opposite channel if [ "$TARGET_CHANNEL" == "beta" ]; then - process_contents "main" + process_contents "stable" else process_contents "beta" fi