Repository: calcite-avatica Updated Branches: refs/heads/master d94935509 -> 3f0e5afe2
[CALCITE-2385] Add flag to disable dockerfile checks when executing a dry-run build Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica/commit/3f0e5afe Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica/tree/3f0e5afe Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica/diff/3f0e5afe Branch: refs/heads/master Commit: 3f0e5afe2d6b05178686ea0454f57c9de4883655 Parents: d949355 Author: Francis Chuang <[email protected]> Authored: Tue Nov 13 09:52:35 2018 +1100 Committer: Francis Chuang <[email protected]> Committed: Thu Nov 15 21:22:01 2018 +1100 ---------------------------------------------------------------------- docker/pom.xml | 7 ++++++- site/_docs/howto.md | 22 +++++----------------- 2 files changed, 11 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/3f0e5afe/docker/pom.xml ---------------------------------------------------------------------- diff --git a/docker/pom.xml b/docker/pom.xml index f99591c..5548499 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -98,7 +98,12 @@ limitations under the License. </profile> <profile> <!-- Need to verify that the URL we're pulling from in the Dockerfile is correct for this release --> - <id>apache-release</id> + <id>check-dockerfile-version</id> + <activation> + <property> + <name>!skipDockerCheck</name> + </property> + </activation> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/calcite-avatica/blob/3f0e5afe/site/_docs/howto.md ---------------------------------------------------------------------- diff --git a/site/_docs/howto.md b/site/_docs/howto.md index 8e60cd7..51e0c5a 100644 --- a/site/_docs/howto.md +++ b/site/_docs/howto.md @@ -206,26 +206,14 @@ start again from the top. # Make sure that there are no junk files in the sandbox git clean -xn -# For the dry run, edit the docker/dockerhub/Dockerfile -patch -p1 <<EOF -diff --git a/docker/src/main/dockerhub/Dockerfile b/docker/src/main/dockerhub/Dockerfile -index 4617a4e..4ccd97f 100644 ---- a/docker/src/main/dockerhub/Dockerfile -+++ b/docker/src/main/dockerhub/Dockerfile -@@ -23,3 +23,3 @@ RUN mkdir -p /home/avatica/classpath -# This line must be preserved. The Maven build will verify this version matches its version --ARG AVATICA_VERSION="1.12.0" -+ARG AVATICA_VERSION="1.12.0-SNAPSHOT" -EOF - # Do a dry run of the release:prepare step, which sets version numbers. # Typically we increment minor version: If X.Y.Z is 1.11.0, X2.Y2.Z2 is 1.12.0. # Note X.Y.Z is the current version we're trying to release, and X2.Y2.Z2 is the next development version. # For example, if I am currently building a release for 1.11.0, X.Y.Z would be 1.11.0 and X2.Y2.Z2 would be 1.12.0. -./mvnw -DdryRun=true -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X2.Y2.Z2-SNAPSHOT -Dtag=avatica-X.Y.Z-rcN -Papache-release -Duser.name=${asf.username} release:prepare +./mvnw -DdryRun=true -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X2.Y2.Z2-SNAPSHOT -Dtag=avatica-X.Y.Z-rcN -Papache-release -Duser.name=${asf.username} release:prepare -Darguments=-DskipDockerCheck -# If you have multiple GPG keys, you can select the key used to sign the release by appending `-Darguments=-Dgpg.keyname=your_key_id`: -./mvnw -DdryRun=true -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X2.Y2.Z2-SNAPSHOT -Dtag=avatica-X.Y.Z-rcN -Papache-release -Duser.name=${asf.username} release:prepare -Darguments=-Dgpg.keyname=your_key_id +# If you have multiple GPG keys, you can select the key used to sign the release by appending `-Dgpg.keyname=${your.key.id}` to `-Darguments`: +./mvnw -DdryRun=true -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X2.Y2.Z2-SNAPSHOT -Dtag=avatica-X.Y.Z-rcN -Papache-release -Duser.name=${asf.username} release:prepare -Darguments="-DskipDockerCheck -Dgpg.keyname=${your.key.id}" {% endhighlight %} @@ -267,8 +255,8 @@ If successful, remove the `-DdryRun` flag and run the release for real. # For example, if I am currently building a release for 1.11.0, X.Y.Z would be 1.11.0 and X2.Y2.Z2 would be 1.12.0. ./mvnw -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X2.Y2.Z2-SNAPSHOT -Dtag=avatica-X.Y.Z-rcN -Papache-release -Duser.name=${asf.username} release:prepare -# If you have multiple GPG keys, you can select the key used to sign the release by appending `-Darguments=-Dgpg.keyname=your_key_id`: -./mvnw -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X2.Y2.Z2-SNAPSHOT -Dtag=avatica-X.Y.Z-rcN -Papache-release -Duser.name=${asf.username} release:prepare -Darguments=-Dgpg.keyname=your_key_id +# If you have multiple GPG keys, you can select the key used to sign the release by appending `-Darguments=-Dgpg.keyname=${your.key.id}`: +./mvnw -DreleaseVersion=X.Y.Z -DdevelopmentVersion=X2.Y2.Z2-SNAPSHOT -Dtag=avatica-X.Y.Z-rcN -Papache-release -Duser.name=${asf.username} release:prepare -Darguments=-Dgpg.keyname=${your.key.id} # Perform checks out the tagged version, builds, and deploys to the staging repository ./mvnw -Papache-release -Duser.name=${asf.username} release:perform -Darguments="-DskipTests"
