This is an automated email from the ASF dual-hosted git repository.
ibzib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 3fbe369 Release script fixes
new 3de6bee Merge pull request #15544 from udim/master
3fbe369 is described below
commit 3fbe369714c6f7bcae6efb2e188c125463ade943
Author: Udi Meiri <eh...@google.com>
AuthorDate: Tue Sep 21 10:38:57 2021 -0700
Release script fixes
---
.../src/main/scripts/build_release_candidate.sh | 33 ++++++++++++++++------
.../main/scripts/deploy_release_candidate_pypi.sh | 8 ++++--
2 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/release/src/main/scripts/build_release_candidate.sh
b/release/src/main/scripts/build_release_candidate.sh
index 76e2b73..8e60ea6 100755
--- a/release/src/main/scripts/build_release_candidate.sh
+++ b/release/src/main/scripts/build_release_candidate.sh
@@ -62,6 +62,16 @@ function usage() {
echo 'Usage: build_release_candidate.sh --release <version> --rc <rc>
--github-user <username> --signing-key <sig> [--debug]'
}
+function wipe_local_clone_dir() {
+ if [[ -d ${LOCAL_CLONE_DIR} ]]; then
+ # Go modules leave behind directories with no write permissions, so readd
+ # write perms to allow rm to work. Also, some files are owned by root and
+ # will fail chmod, hence the `|| true`. Luckily they're world writable.
+ chmod -R u+w ${LOCAL_CLONE_DIR} || true
+ rm -rf ${LOCAL_CLONE_DIR}
+ fi
+}
+
RELEASE=
RC_NUM=
SIGNING_KEY=
@@ -161,9 +171,7 @@ if [[ $confirmation = "y" ]]; then
echo "============Building and Staging Java Artifacts============="
echo "--------Cloning Beam Repo and Checkout Release Tag-------"
cd ~
- if [[ -d ${LOCAL_CLONE_DIR} ]]; then
- rm -rf ${LOCAL_CLONE_DIR}
- fi
+ wipe_local_clone_dir
mkdir -p ${LOCAL_CLONE_DIR}
cd ${LOCAL_CLONE_DIR}
git clone --depth 1 --branch "${RC_TAG}" ${GIT_REPO_URL} "${BEAM_ROOT_DIR}"
@@ -173,10 +181,17 @@ if [[ $confirmation = "y" ]]; then
git config credential.helper store
echo "-------------Staging Java Artifacts into Maven---------------"
+ # Cache the key/passphrase in gpg-agent by signing an arbitrary file.
gpg --local-user ${SIGNING_KEY} --output /dev/null --sign ~/.bashrc
- ./gradlew publish -Psigning.gnupg.keyName=${SIGNING_KEY} -PisRelease
--no-daemon
+ # Too many workers can overload (?) gpg-agent, causing gpg to prompt for a
+ # passphrase, and gradle doesn't play nice with pinentry.
+ # https://github.com/gradle/gradle/issues/11706
+ # --max-workers=6 works, but parallelism also seems to cause
+ # multiple Nexus repos to be created, so parallelism is disabled.
+ # https://issues.apache.org/jira/browse/BEAM-11813
+ ./gradlew publish -Psigning.gnupg.keyName=${SIGNING_KEY} -PisRelease
--no-daemon --no-parallel
echo "You need to close the staging repository manually on Apache Nexus. See
the release guide for instructions."
- rm -rf ~/${LOCAL_CLONE_DIR}
+ wipe_local_clone_dir
fi
echo "[Current Step]: Stage source release on dist.apache.org"
@@ -256,6 +271,7 @@ if [[ $confirmation = "y" ]]; then
echo '-------------------Creating Python Virtualenv-----------------'
python3 -m venv "${LOCAL_PYTHON_VIRTUALENV}"
source "${LOCAL_PYTHON_VIRTUALENV}/bin/activate"
+ pip install -U pip
pip install requests python-dateutil
echo '--------------Fetching GitHub Actions Artifacts--------------'
@@ -306,9 +322,7 @@ read confirmation
if [[ $confirmation = "y" ]]; then
echo "============Staging SDK docker images on docker hub========="
cd ~
- if [[ -d ${LOCAL_CLONE_DIR} ]]; then
- rm -rf ${LOCAL_CLONE_DIR}
- fi
+ wipe_local_clone_dir
mkdir -p ${LOCAL_CLONE_DIR}
cd ${LOCAL_CLONE_DIR}
@@ -319,7 +333,7 @@ if [[ $confirmation = "y" ]]; then
./gradlew :pushAllDockerImages -Pdocker-pull-licenses
-Pdocker-tag=${RELEASE}_rc${RC_NUM}
- rm -rf ~/${LOCAL_CLONE_DIR}
+ wipe_local_clone_dir
fi
echo "[Current Step]: Update beam-site"
@@ -341,6 +355,7 @@ if [[ $confirmation = "y" ]]; then
python3 -m venv "${LOCAL_PYTHON_VIRTUALENV}"
source "${LOCAL_PYTHON_VIRTUALENV}/bin/activate"
cd ${LOCAL_PYTHON_DOC}
+ pip install -U pip
pip install tox
git clone --branch "${RC_TAG}" --depth 1 ${GIT_REPO_URL}
cd ${BEAM_ROOT_DIR}
diff --git a/release/src/main/scripts/deploy_release_candidate_pypi.sh
b/release/src/main/scripts/deploy_release_candidate_pypi.sh
index 7502eb5..c52a993 100755
--- a/release/src/main/scripts/deploy_release_candidate_pypi.sh
+++ b/release/src/main/scripts/deploy_release_candidate_pypi.sh
@@ -127,6 +127,10 @@ RELEASE_COMMIT=$(git rev-list -n 1 $RC_TAG)
echo "================Download python artifacts======================"
PYTHON_ARTIFACTS_DIR="${LOCAL_CLONE_DIR_ROOT}/python"
+virtualenv deploy_pypi_env
+source ./deploy_pypi_env/bin/activate
+pip install -U pip
+pip install requests python-dateutil
python "${SCRIPT_DIR}/download_github_actions_artifacts.py" \
--github-user "${USER_GITHUB_ID}" \
--repo-url "${GIT_REPO_BASE_URL}" \
@@ -149,8 +153,6 @@ echo "===================Removing sha512
files======================="
rm $(ls | grep -i ".*.sha512$")
echo "====================Upload rc to pypi========================"
-virtualenv deploy_pypi_env
-source ./deploy_pypi_env/bin/activate
pip install twine
mkdir dist && mv $(ls | grep apache) dist && cd dist
@@ -170,4 +172,4 @@ else
echo "Skipping deployment to PyPI. Run the script with --deploy to stage the
artifacts."
fi
-clean_up
\ No newline at end of file
+clean_up
