You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2018/07/23 10:13:59 UTC
[2/5] flink git commit: [FLINK-9888][release] Remove unsafe defaults
from release scripts
[FLINK-9888][release] Remove unsafe defaults from release scripts
This closes #6362.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b81cccfa
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b81cccfa
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b81cccfa
Branch: refs/heads/master
Commit: b81cccfa9a6559d159350daeea1dc03257fd6112
Parents: d1a305e
Author: zentol <ch...@apache.org>
Authored: Wed Jul 18 13:42:06 2018 +0200
Committer: zentol <ch...@apache.org>
Committed: Mon Jul 23 09:13:02 2018 +0200
----------------------------------------------------------------------
tools/releasing/create_binary_release.sh | 6 +++++-
tools/releasing/create_release_branch.sh | 12 ++++++++++--
tools/releasing/create_source_release.sh | 6 +++++-
tools/releasing/update_branch_version.sh | 12 ++++++++++--
4 files changed, 30 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/b81cccfa/tools/releasing/create_binary_release.sh
----------------------------------------------------------------------
diff --git a/tools/releasing/create_binary_release.sh b/tools/releasing/create_binary_release.sh
index 0bdff60..4dbc6fa 100755
--- a/tools/releasing/create_binary_release.sh
+++ b/tools/releasing/create_binary_release.sh
@@ -20,12 +20,16 @@
##
## Variables with defaults (if not overwritten by environment)
##
-RELEASE_VERSION=${RELEASE_VERSION:-1.3-SNAPSHOT}
SCALA_VERSION=none
HADOOP_VERSION=none
SKIP_GPG=${SKIP_GPG:-false}
MVN=${MVN:-mvn}
+if [ -z "${RELEASE_VERSION}" ]; then
+ echo "RELEASE_VERSION was not set."
+ exit 1
+fi
+
# fail immediately
set -o errexit
set -o nounset
http://git-wip-us.apache.org/repos/asf/flink/blob/b81cccfa/tools/releasing/create_release_branch.sh
----------------------------------------------------------------------
diff --git a/tools/releasing/create_release_branch.sh b/tools/releasing/create_release_branch.sh
index 9853252..7e16483 100755
--- a/tools/releasing/create_release_branch.sh
+++ b/tools/releasing/create_release_branch.sh
@@ -20,11 +20,19 @@
##
## Variables with defaults (if not overwritten by environment)
##
-OLD_VERSION=${OLD_VERSION:-1.2-SNAPSHOT}
-NEW_VERSION=${NEW_VERSION:-1.3-SNAPSHOT}
RELEASE_CANDIDATE=${RELEASE_CANDIDATE:-none}
MVN=${MVN:-mvn}
+if [ -z "${OLD_VERSION}" ]; then
+ echo "OLD_VERSION was not set."
+ exit 1
+fi
+
+if [ -z "${NEW_VERSION}" ]; then
+ echo "NEW_VERSION was not set."
+ exit 1
+fi
+
# fail immediately
set -o errexit
set -o nounset
http://git-wip-us.apache.org/repos/asf/flink/blob/b81cccfa/tools/releasing/create_source_release.sh
----------------------------------------------------------------------
diff --git a/tools/releasing/create_source_release.sh b/tools/releasing/create_source_release.sh
index 0cc32fe..9329802 100755
--- a/tools/releasing/create_source_release.sh
+++ b/tools/releasing/create_source_release.sh
@@ -20,9 +20,13 @@
##
## Variables with defaults (if not overwritten by environment)
##
-RELEASE_VERSION=${RELEASE_VERSION:-1.3-SNAPSHOT}
MVN=${MVN:-mvn}
+if [ -z "${RELEASE_VERSION}" ]; then
+ echo "RELEASE_VERSION was not set."
+ exit 1
+fi
+
# fail immediately
set -o errexit
set -o nounset
http://git-wip-us.apache.org/repos/asf/flink/blob/b81cccfa/tools/releasing/update_branch_version.sh
----------------------------------------------------------------------
diff --git a/tools/releasing/update_branch_version.sh b/tools/releasing/update_branch_version.sh
index e4dc710..951ea71 100755
--- a/tools/releasing/update_branch_version.sh
+++ b/tools/releasing/update_branch_version.sh
@@ -20,10 +20,18 @@
##
## Variables with defaults (if not overwritten by environment)
##
-OLD_VERSION=${OLD_VERSION:-1.4-SNAPSHOT}
-NEW_VERSION=${NEW_VERSION:-1.5-SNAPSHOT}
MVN=${MVN:-mvn}
+if [ -z "${OLD_VERSION}" ]; then
+ echo "OLD_VERSION was not set."
+ exit 1
+fi
+
+if [ -z "${NEW_VERSION}" ]; then
+ echo "NEW_VERSION was not set."
+ exit 1
+fi
+
# fail immediately
set -o errexit
set -o nounset