From c1bca542b5b6ff2e72377e608ac8ff069c39a37f Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Wed, 18 Sep 2024 10:53:11 -0700 Subject: [PATCH 1/6] Update `publish_alpha_release` to use current shared action versions Warnings noted in https://github.com/NeonGeckoCom/skill-caffeinewiz/actions/runs/10927092034 --- .github/workflows/publish_alpha_release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish_alpha_release.yml b/.github/workflows/publish_alpha_release.yml index f23277d..575dde4 100644 --- a/.github/workflows/publish_alpha_release.yml +++ b/.github/workflows/publish_alpha_release.yml @@ -74,7 +74,7 @@ jobs: path: action/github/ repository: NeonGeckoCom/.github - name: Setup Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: Increment Alpha Version @@ -94,7 +94,7 @@ jobs: run: | python action/package/${{ inputs.on_version_change }} ${{ steps.version.outputs.version }} - name: Push Version Change - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: Increment Version to ${{ steps.version.outputs.version }} repository: action/package/ @@ -127,7 +127,7 @@ jobs: maxIssues: ${{ inputs.changelog_max_issues }} sinceTag: ${{ steps.latest_release.outputs.release }} - name: Push Changelog - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: Update Changelog repository: action/package/ @@ -149,7 +149,7 @@ jobs: path: action/github/ repository: NeonGeckoCom/.github - name: Setup Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: Install Build Tools @@ -162,7 +162,7 @@ jobs: - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: - packages_dir: action/package/dist/ + packages-dir: action/package/dist/ password: ${{secrets.PYPI_TOKEN}} tag_prerelease: needs: From 0c142dbadb18997741b18f12cbafc93ecdb417c6 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Wed, 18 Sep 2024 10:58:14 -0700 Subject: [PATCH 2/6] Update `publish_stable_release` to use latest shared automations --- .github/workflows/publish_alpha_release.yml | 12 ++++++------ .github/workflows/publish_stable_release.yml | 7 ++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish_alpha_release.yml b/.github/workflows/publish_alpha_release.yml index 575dde4..8b55e9a 100644 --- a/.github/workflows/publish_alpha_release.yml +++ b/.github/workflows/publish_alpha_release.yml @@ -64,12 +64,12 @@ jobs: version: ${{ steps.version.outputs.version }} steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: ${{ inputs.branch }} path: action/package/ - name: Checkout Scripts Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: action/github/ repository: NeonGeckoCom/.github @@ -106,7 +106,7 @@ jobs: changelog: ${{ steps.changelog.outputs.changelog }} steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: ${{ inputs.branch }} path: action/package/ @@ -139,12 +139,12 @@ jobs: runs-on: ${{inputs.runner}} steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: ${{ inputs.branch }} path: action/package/ - name: Checkout Scripts Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: action/github/ repository: NeonGeckoCom/.github @@ -172,7 +172,7 @@ jobs: runs-on: ${{inputs.runner}} steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: ${{ inputs.branch }} path: action/package/ diff --git a/.github/workflows/publish_stable_release.yml b/.github/workflows/publish_stable_release.yml index c932ec8..64995d2 100644 --- a/.github/workflows/publish_stable_release.yml +++ b/.github/workflows/publish_stable_release.yml @@ -13,7 +13,7 @@ jobs: tag_release: runs-on: ${{inputs.runner}} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Get Version run: | VERSION=$(python setup.py --version) @@ -22,13 +22,14 @@ jobs: with: token: ${{secrets.GITHUB_TOKEN}} tag: ${{env.VERSION}} + generateReleaseNotes: true build_and_publish_pypi: runs-on: ${{inputs.runner}} steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: Install Build Tools From e9f9d02188d639eeed7f885a946743b57dfe318f Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Wed, 18 Sep 2024 11:33:23 -0700 Subject: [PATCH 3/6] Replace `setup.py build` with `python -m build` per https://packaging.python.org/en/latest/discussions/setup-py-deprecated/ --- .github/workflows/publish_alpha_release.yml | 2 +- .github/workflows/publish_stable_release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_alpha_release.yml b/.github/workflows/publish_alpha_release.yml index 8b55e9a..19b233b 100644 --- a/.github/workflows/publish_alpha_release.yml +++ b/.github/workflows/publish_alpha_release.yml @@ -158,7 +158,7 @@ jobs: - name: Build Distribution Packages run: | cd action/package - python ${{ inputs.setup_py }} sdist bdist_wheel + python -m build - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: diff --git a/.github/workflows/publish_stable_release.yml b/.github/workflows/publish_stable_release.yml index 64995d2..dcb622d 100644 --- a/.github/workflows/publish_stable_release.yml +++ b/.github/workflows/publish_stable_release.yml @@ -37,7 +37,7 @@ jobs: python -m pip install build wheel - name: Build Distribution Packages run: | - python setup.py sdist bdist_wheel + python -m build - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: From c5347d5ec73d678c14723c206ab01e3972884ef6 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Wed, 18 Sep 2024 12:50:01 -0700 Subject: [PATCH 4/6] Skip source build if it fails --- .github/workflows/publish_alpha_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_alpha_release.yml b/.github/workflows/publish_alpha_release.yml index 19b233b..dafd133 100644 --- a/.github/workflows/publish_alpha_release.yml +++ b/.github/workflows/publish_alpha_release.yml @@ -158,7 +158,7 @@ jobs: - name: Build Distribution Packages run: | cd action/package - python -m build + python -m build || python -m build --wheel - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: From 2809829f9013af0e25c183241f1e42b832354e4d Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Wed, 18 Sep 2024 12:57:34 -0700 Subject: [PATCH 5/6] Add verbose logging for PyPI upload --- .github/workflows/publish_alpha_release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish_alpha_release.yml b/.github/workflows/publish_alpha_release.yml index dafd133..8c9daa6 100644 --- a/.github/workflows/publish_alpha_release.yml +++ b/.github/workflows/publish_alpha_release.yml @@ -164,6 +164,7 @@ jobs: with: packages-dir: action/package/dist/ password: ${{secrets.PYPI_TOKEN}} + verbose: true tag_prerelease: needs: - update_changelog From d027f95491b78d6294656937484fe37c1d656612 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Wed, 18 Sep 2024 13:31:10 -0700 Subject: [PATCH 6/6] Revert change to troubleshoot upload failures --- .github/workflows/publish_alpha_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_alpha_release.yml b/.github/workflows/publish_alpha_release.yml index 8c9daa6..facfecb 100644 --- a/.github/workflows/publish_alpha_release.yml +++ b/.github/workflows/publish_alpha_release.yml @@ -158,7 +158,7 @@ jobs: - name: Build Distribution Packages run: | cd action/package - python -m build || python -m build --wheel + python ${{ inputs.setup_py }} sdist bdist_wheel - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: