This is an automated email from the ASF dual-hosted git repository.
mrutkowski pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-release.git
The following commit(s) were added to refs/heads/master by this push:
new 0cce4e6 Add the missing RELEASE_URL and RELEASE_VERSION_URL to access
release URL (#91)
0cce4e6 is described below
commit 0cce4e62d48cbb052d29f590cad8a298d1ae0f54
Author: Vincent <[email protected]>
AuthorDate: Thu Apr 5 18:16:41 2018 -0400
Add the missing RELEASE_URL and RELEASE_VERSION_URL to access release URL
(#91)
---
tools/clean_remote_release_artifacts.sh | 4 ++--
tools/load_config.sh | 5 +++++
tools/move_stage_to_release.sh | 3 +++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/tools/clean_remote_release_artifacts.sh
b/tools/clean_remote_release_artifacts.sh
index ccda065..851c7f3 100755
--- a/tools/clean_remote_release_artifacts.sh
+++ b/tools/clean_remote_release_artifacts.sh
@@ -27,6 +27,6 @@ SVN_PASSWORD=$3
source "$SCRIPTDIR/load_config.sh" "$WORK_DIR" "$SVN_USERNAME" "$SVN_PASSWORD"
-if [[ `wget -S --spider $CURRENT_VERSION_URL 2>&1 | grep 'HTTP/1.1 200 OK'`
]]; then
- svn delete $CURRENT_VERSION_URL -m "Removing Apache OpenWhisk release
${full_version}." $CREDENTIALS
+if [[ `wget -S --spider $RELEASE_VERSION_URL 2>&1 | grep 'HTTP/1.1 200 OK'`
]]; then
+ svn delete $RELEASE_VERSION_URL -m "Removing Apache OpenWhisk release
${version}." $CREDENTIALS
fi
diff --git a/tools/load_config.sh b/tools/load_config.sh
index 7cb36eb..e70f7a5 100755
--- a/tools/load_config.sh
+++ b/tools/load_config.sh
@@ -38,6 +38,7 @@ CONFIG=$(read_file $SCRIPTDIR/config.json)
PUBLISH_STAGE=$(json_by_key "$CONFIG" "publish_stage")
repos=$(echo $(json_by_key "$CONFIG" "RepoList") | sed 's/[][]//g')
STAGE_URL=$(json_by_key "$CONFIG" "stage_url")
+RELEASE_URL=$(json_by_key "$CONFIG" "release_url")
version_key="versioning"
version=$(json_by_key "$CONFIG" ${version_key}.version)
@@ -52,6 +53,10 @@ if [ ! -z "$pre_release_version" ]; then
fi
REMOTE_PATH="openwhisk-$full_version"
+REMOTE_PATH_RELEASE="openwhisk-$version"
CURRENT_VERSION_URL="$STAGE_URL/${REMOTE_PATH}/"
CURRENT_VERSION_DIR="$OPENWHISK_SVN/$REMOTE_PATH"
+
+RELEASE_VERSION_URL_STAGE="$RELEASE_URL/${REMOTE_PATH}/"
+RELEASE_VERSION_URL="$RELEASE_URL/${REMOTE_PATH_RELEASE}/"
diff --git a/tools/move_stage_to_release.sh b/tools/move_stage_to_release.sh
index c0b5ba3..8048b79 100755
--- a/tools/move_stage_to_release.sh
+++ b/tools/move_stage_to_release.sh
@@ -33,4 +33,7 @@ fi
if [[ `wget -S --spider $CURRENT_VERSION_URL 2>&1 | grep 'HTTP/1.1 200 OK'`
]]; then
svn copy $CURRENT_VERSION_URL $RELEASE_URL -m "Releasing Apache OpenWhisk
release ${full_version}." $CREDENTIALS
+ if [ "$full_version" != "$version" ]; then
+ svn mv $RELEASE_VERSION_URL_STAGE $RELEASE_VERSION_URL -m "Remaning
the directory from ${full_version} to ${version}." $CREDENTIALS
+ fi
fi
--
To stop receiving notification emails like this one, please contact
[email protected].
