You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/12/04 21:11:48 UTC
spark git commit: [HOTFIX] Fixing two issues with the release script.
Repository: spark
Updated Branches:
refs/heads/master 8106b1e36 -> 8dae26f83
[HOTFIX] Fixing two issues with the release script.
1. The version replacement was still producing some false changes.
2. Uploads to the staging repo specifically.
Author: Patrick Wendell <pw...@gmail.com>
Closes #3608 from pwendell/release-script and squashes the following commits:
3c63294 [Patrick Wendell] Fixing two issues with the release script:
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8dae26f8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8dae26f8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8dae26f8
Branch: refs/heads/master
Commit: 8dae26f83818ee0f5ce8e5b083625170d2e901c5
Parents: 8106b1e
Author: Patrick Wendell <pw...@gmail.com>
Authored: Thu Dec 4 12:11:41 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Thu Dec 4 12:11:41 2014 -0800
----------------------------------------------------------------------
dev/create-release/create-release.sh | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/8dae26f8/dev/create-release/create-release.sh
----------------------------------------------------------------------
diff --git a/dev/create-release/create-release.sh b/dev/create-release/create-release.sh
index e0aca46..3b89aab 100755
--- a/dev/create-release/create-release.sh
+++ b/dev/create-release/create-release.sh
@@ -39,7 +39,6 @@ RC_NAME=${RC_NAME:-rc2}
M2_REPO=~/.m2/repository
SPARK_REPO=$M2_REPO/org/apache/spark
NEXUS_ROOT=https://repository.apache.org/service/local/staging
-NEXUS_UPLOAD=$NEXUS_ROOT/deploy/maven2
NEXUS_PROFILE=d63f592e7eac0 # Profile for Spark staging uploads
if [ -z "$JAVA_HOME" ]; then
@@ -64,19 +63,28 @@ if [[ ! "$@" =~ --package-only ]]; then
# NOTE: This is done "eagerly" i.e. we don't check if we can succesfully build
# or before we coin the release commit. This helps avoid races where
# other people add commits to this branch while we are in the middle of building.
- old=" <version>${RELEASE_VERSION}-SNAPSHOT<\/version>"
- new=" <version>${RELEASE_VERSION}<\/version>"
- find . -name pom.xml -o -name package.scala | grep -v dev | xargs -I {} sed -i \
- -e "s/$old/$new/" {}
+ cur_ver="${RELEASE_VERSION}-SNAPSHOT"
+ rel_ver="${RELEASE_VERSION}"
+ next_ver="${NEXT_VERSION}-SNAPSHOT"
+
+ old="^\( \{2,4\}\)<version>${cur_ver}<\/version>$"
+ new="\1<version>${rel_ver}<\/version>"
+ find . -name pom.xml | grep -v dev | xargs -I {} sed -i \
+ -e "s/${old}/${new}/" {}
+ find . -name package.scala | grep -v dev | xargs -I {} sed -i \
+ -e "s/${old}/${new}/" {}
+
git commit -a -m "Preparing Spark release $GIT_TAG"
echo "Creating tag $GIT_TAG at the head of $GIT_BRANCH"
git tag $GIT_TAG
- old=" <version>${RELEASE_VERSION}<\/version>"
- new=" <version>${NEXT_VERSION}-SNAPSHOT<\/version>"
- find . -name pom.xml -o -name package.scala | grep -v dev | xargs -I {} sed -i \
+ old="^\( \{2,4\}\)<version>${rel_ver}<\/version>$"
+ new="\1<version>${next_ver}<\/version>"
+ find . -name pom.xml | grep -v dev | xargs -I {} sed -i \
-e "s/$old/$new/" {}
- git commit -a -m "Preparing development version ${NEXT_VERSION}-SNAPSHOT"
+ find . -name package.scala | grep -v dev | xargs -I {} sed -i \
+ -e "s/${old}/${new}/" {}
+ git commit -a -m "Preparing development version $next_ver"
git push origin $GIT_TAG
git push origin HEAD:$GIT_BRANCH
git checkout -f $GIT_TAG
@@ -118,12 +126,13 @@ if [[ ! "$@" =~ --package-only ]]; then
gpg --print-md SHA1 $file > $file.sha1
done
- echo "Uplading files to $NEXUS_UPLOAD"
+ nexus_upload=$NEXUS_ROOT/deployByRepositoryId/$staged_repo_id
+ echo "Uplading files to $nexus_upload"
for file in $(find . -type f)
do
# strip leading ./
file_short=$(echo $file | sed -e "s/\.\///")
- dest_url="$NEXUS_UPLOAD/org/apache/spark/$file_short"
+ dest_url="$nexus_upload/org/apache/spark/$file_short"
echo " Uploading $file_short"
curl -u $ASF_USERNAME:$ASF_PASSWORD --upload-file $file_short $dest_url
done
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org