Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix: Update Gradle publish job
[releng/global-jjb.git]
/
shell
/
pypi-upload.sh
diff --git
a/shell/pypi-upload.sh
b/shell/pypi-upload.sh
index
86fff16
..
e47135e
100644
(file)
--- a/
shell/pypi-upload.sh
+++ b/
shell/pypi-upload.sh
@@
-17,11
+17,12
@@
echo "---> pypi-upload.sh"
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
-virtualenv -p python3 /tmp/pypi
-PATH=/tmp/pypi/bin:$PATH
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+# Version controlled by JJB_VERSION
+lf-activate-venv setuptools==65.7.0 urllib3~=1.26.15 twine wheel readline
-echo "INFO: installing twine to upload distributions"
-pip install -q twine
echo "INFO: cd to tox-dir $TOX_DIR"
cd "$WORKSPACE/$TOX_DIR"
echo "INFO: cd to tox-dir $TOX_DIR"
cd "$WORKSPACE/$TOX_DIR"
@@
-29,10
+30,13
@@
cd "$WORKSPACE/$TOX_DIR"
cmd="twine upload -r $REPOSITORY dist/*"
if $DRY_RUN; then
echo "INFO: dry-run is set, echoing command only"
cmd="twine upload -r $REPOSITORY dist/*"
if $DRY_RUN; then
echo "INFO: dry-run is set, echoing command only"
- echo
$cmd
+ echo
"$cmd"
else
echo "INFO: uploading distributions to repo $REPOSITORY"
$cmd
else
echo "INFO: uploading distributions to repo $REPOSITORY"
$cmd
+ # emit message and files on single line for release-job
+ # shellcheck disable=SC2046
+ echo "INFO: successfully uploaded distributions: " $(ls dist)
fi
echo "---> pypi-upload.sh ends"
fi
echo "---> pypi-upload.sh ends"