You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2019/07/18 03:12:15 UTC
[incubator-datasketches-memory] branch master updated: update
scripts
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-memory.git
The following commit(s) were added to refs/heads/master by this push:
new 8b85251 update scripts
8b85251 is described below
commit 8b85251ce92c34e860164e77aa6752d3693299eb
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Wed Jul 17 20:12:06 2019 -0700
update scripts
---
scripts/bashDeployToDist.sh | 55 +++++++++++++++++++++++++++++++++++------
scripts/pomDeployToDist.sh | 60 +--------------------------------------------
2 files changed, 49 insertions(+), 66 deletions(-)
diff --git a/scripts/bashDeployToDist.sh b/scripts/bashDeployToDist.sh
index 8a4cadf..fccecf9 100755
--- a/scripts/bashDeployToDist.sh
+++ b/scripts/bashDeployToDist.sh
@@ -27,7 +27,42 @@ echo "================Bash Deploy to Dist================"
echo " This script must be run from the base directory of the project."
echo " This script obtains the 'project.artifactId' and the 'project.version' from the \$1 and \$2 input parameters "
echo " For example: $ scripts/bashDeployToDist.sh datasketches-memory 0.12.3-incubator"
-echo " Refer to the top of the 'pomDeployToDist.sh' for a description of the dist datastructure."
+echo
+echo "===========The Dist Deployment Structure==========="
+echo "The DataSketche base directories in https://dist.apache.org/repos/dist/ are:"
+echo " - dev/incubator/datasketches/"
+echo " - release/incubator/datasketches/"
+echo
+echo " Each of these two directories contain a KEYS file, which is where you must have your GPG public key stored."
+echo
+echo "After graduation the base directories will be the same but without the incubator level."
+echo
+echo "For both the dev and the release branches, the root contains sub-directories for each of "
+echo "the datasketches-X repositories as follows:"
+echo " - characterization/"
+echo " - core/"
+echo " - cpp/"
+echo " - hive/"
+echo " - memory/"
+echo " - pig/"
+echo " - postgresql/"
+echo " - vector/"
+echo
+echo "Below these sub=directories is a level of leaf directories that define a particular release or release candidate."
+echo
+echo "Finally the leaf directories contain the zip and signature files for a release or release candidate."
+echo "The full tree will look something like this example:"
+echo " dist/"
+echo " dev/"
+echo " incubator/"
+echo " datasketches/"
+echo " KEYS"
+echo " memory/"
+echo " 0.12.3-incubating-RC1/"
+echo " apache-datasketches-memory-0.12.3-incubating-src.zip"
+echo " apache-datasketches-memory-0.12.3-incubating-src.zip.asc"
+echo " apache-datasketches-memory-0.12.3-incubating-src.zip.sha512"
+echo " etc."
echo
echo "===================Check List======================"
echo "1. Verify that you can successfully read and write to the dist directories using SVN."
@@ -45,15 +80,21 @@ echo
echo " 'SNAPSHOT', if relevant, is always at the end of the version string and capitalized."
echo " Note: SNAPSHOT deployments are never relevant for the 'release' branch."
echo
-echo "Proceed? [y|N]"
-read confirm
-if [[ $confirm != "y" ]];
+echo "4. Verify that your local GitHub repository current and the git status is clean."
+echo
+echo "5. Locally checkout the branch or tag that you want to deploy."
+echo
+echo "Proceed? [y|N]"; read confirm; if [[ $confirm != "y" ]]; then echo "Please rerun this script when ready."; exit; fi
+
+if [[ -n $(git status --porcelain) ]];
then
- "Please rerun this script when ready."
echo
- exit
+ echo "ERROR!!! Your GitHub repo is not clean!"
+ echo
+ exit 1
fi
+
TIME=$(date -u +%Y%m%d.%H%M%S)
BASE=$(pwd)
echo
@@ -63,7 +104,7 @@ echo
echo "## Load GPG Agent:"
eval $(gpg-agent --daemon) > /dev/null
-## Extract project.artifactId and project.version from POM:
+## Extract project.artifactId and project.version from input parameters:
ProjectArtifactId=$1
ProjectVersion=$2
diff --git a/scripts/pomDeployToDist.sh b/scripts/pomDeployToDist.sh
index 8e84fc5..3c709d9 100755
--- a/scripts/pomDeployToDist.sh
+++ b/scripts/pomDeployToDist.sh
@@ -27,66 +27,8 @@ echo " which must be found in this directory."
echo " For example: $ scripts/pomDeployToDist.sh"
echo " If your project does not have a pom, then you should use the 'bashDeployToDist.sh' instead"
echo
-echo "===========The Dist Deployment Structure==========="
-echo "The DataSketche base directories in https://dist.apache.org/repos/dist/ are:"
-echo " - dev/incubator/datasketches/"
-echo " - release/incubator/datasketches/"
echo
-echo " Each of these two directories contain a KEYS file, which is where you must have your GPG public key stored."
-echo
-echo "After graduation the base directories will be the same but without the incubator level."
-echo
-echo "For both the dev and the release branches, the root contains sub-directories for each of "
-echo "the datasketches-X repositories as follows:"
-echo " - characterization/"
-echo " - core/"
-echo " - cpp/"
-echo " - hive/"
-echo " - memory/"
-echo " - pig/"
-echo " - postgresql/"
-echo " - vector/"
-echo
-echo "Below these sub=directories is a level of leaf directories that define a particular release or release candidate."
-echo
-echo "Finally the leaf directories contain the zip and signature files for a release or release candidate."
-echo "The full tree will look something like this example:"
-echo " dist/"
-echo " dev/"
-echo " incubator/"
-echo " datasketches/"
-echo " KEYS"
-echo " memory/"
-echo " 0.12.3-incubating-RC1/"
-echo " apache-datasketches-memory-0.12.3-incubating-src.zip"
-echo " apache-datasketches-memory-0.12.3-incubating-src.zip.asc"
-echo " apache-datasketches-memory-0.12.3-incubating-src.zip.sha512"
-echo " etc."
-echo
-echo "===================Check List======================"
-echo "1. Verify that you can successfully read and write to the dist directories using SVN."
-echo
-echo "2. Verify that your GPG keys have been created and stored in:"
-echo " - https://dist.apache.org/repos/dist/dev/incubator/datasketches/KEYS AND"
-echo " - https://dist.apache.org/repos/dist/release/incubator/datasketches/KEYS"
-echo
-echo "3. Verify the POM project.version format is one of:"
-echo " X.Y.Z"
-echo " X.Y.Z-SNAPSHOT"
-echo " X.Y.Z-incubator"
-echo " X.Y.Z-incubator-SNAPSHOT"
-echo
-echo " 'SNAPSHOT', if relevant, is always at the end of the version string and capitalized."
-echo
-echo "4. Note: this script DOES NOT MODIFY POM. You must do that manually."
-echo
-echo "Proceed? [y|N]"
-read confirm
-if [[ $confirm != "y" ]];
-then
- "Please rerun this script when ready."
- exit
-fi
+echo "Proceed? [y|N]"; read confirm; if [[ $confirm != "y" ]]; then echo "Please rerun this script when ready."; exit; fi
# extract the project.artifactId
ProjectArtifactId=$(mvn help:evaluate -Dexpression=project.artifactId -q -DforceStdout)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org