You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2023/12/21 15:14:27 UTC
(beam) branch master updated: Fix logging/quoting (#29854)
This is an automated email from the ASF dual-hosted git repository.
damccorm 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 6345c8bf681 Fix logging/quoting (#29854)
6345c8bf681 is described below
commit 6345c8bf681710f2ddd3d918b39449750ffd3bff
Author: Danny McCormick <da...@google.com>
AuthorDate: Thu Dec 21 10:14:21 2023 -0500
Fix logging/quoting (#29854)
---
.github/workflows/deploy_release_candidate_pypi.yaml | 7 ++++---
.github/workflows/finalize_release.yml | 11 +++++++----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/deploy_release_candidate_pypi.yaml b/.github/workflows/deploy_release_candidate_pypi.yaml
index fd3994f658e..8dafd520b1b 100644
--- a/.github/workflows/deploy_release_candidate_pypi.yaml
+++ b/.github/workflows/deploy_release_candidate_pypi.yaml
@@ -31,8 +31,9 @@ jobs:
steps:
- name: Mask PyPi id/password
run: |
- echo "::add-mask::${{ github.event.inputs.PYPI_USER }}"
- echo "::add-mask::${{ github.event.inputs.PYPI_PASSWORD }}"
+ # Workaround for Actions bug - https://github.com/actions/runner/issues/643
+ PYPI_PASSWORD=$(jq -r '.inputs.PYPI_PASSWORD' $GITHUB_EVENT_PATH)
+ echo "::add-mask::$PYPI_PASSWORD"
- name: Checkout
uses: actions/checkout@v4
- name: Setup environment
@@ -86,4 +87,4 @@ jobs:
echo "Will upload the following files to PyPI:"
ls
- twine upload * -u ${{ github.event.inputs.PYPI_USER }} -p ${{ github.event.inputs.PYPI_PASSWORD }}
+ twine upload * -u "${{ github.event.inputs.PYPI_USER }}" -p "${{ github.event.inputs.PYPI_PASSWORD }}"
diff --git a/.github/workflows/finalize_release.yml b/.github/workflows/finalize_release.yml
index 9a8b47ad3e4..d96b59ee7cf 100644
--- a/.github/workflows/finalize_release.yml
+++ b/.github/workflows/finalize_release.yml
@@ -91,10 +91,13 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- - name: Mask and validate PyPi id/password
+ - name: Mask PyPi password
+ run: |
+ # Workaround for Actions bug - https://github.com/actions/runner/issues/643
+ PYPI_PASSWORD=$(jq -r '.inputs.PYPI_PASSWORD' $GITHUB_EVENT_PATH)
+ echo "::add-mask::$PYPI_PASSWORD"
+ - name: Validate PyPi id/password
run: |
- echo "::add-mask::${{ github.event.inputs.PYPI_USER }}"
- echo "::add-mask::${{ github.event.inputs.PYPI_PASSWORD }}"
if [ "${{ github.event.inputs.PYPI_USER }}" == "" ]
then
echo "Must provide a PyPi username to publish artifacts to PyPi"
@@ -122,7 +125,7 @@ jobs:
cd "dist.apache.org/repos/dist/dev/beam/${RELEASE}/python/"
echo "Will upload the following files to PyPI:"
ls
- twine upload * -u ${{ github.event.inputs.PYPI_USER }} -p ${{ github.event.inputs.PYPI_PASSWORD }}
+ twine upload * -u "${{ github.event.inputs.PYPI_USER }}" -p "${{ github.event.inputs.PYPI_PASSWORD }}"
push_git_tags:
if: ${{github.event.inputs.TAG_RELEASE == 'yes'}}