Skip to content

Commit

Permalink
Artifact Actions v4 (#493)
Browse files Browse the repository at this point in the history
* Unique artifact names.

* Download and artifact versions.

* Don't need hashes since actions are not third party.

* Use short versions.

* Unique bdist upload name.

* Try merge-multiple.
  • Loading branch information
trexfeathers authored Sep 30, 2024
1 parent 3ecdfc6 commit 4085387
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-locks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
tox -e ${{ matrix.lock }} -- --platform osx-64 --platform win-64
- name: "Upload lock artifacts"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: lock-artifacts
path: ${{ github.workspace }}/requirements/locks/${{ matrix.lock }}*.txt
Expand All @@ -106,7 +106,7 @@ jobs:
uses: actions/checkout@v4

- name: "Download lock artifacts"
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: lock-artifacts
path: ${{ github.workspace }}/requirements/locks
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/ci-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ jobs:
UDUNITS2_XML_PATH: ${{ matrix.xml_path }}
CIBW_ENVIRONMENT_PASS_LINUX: UDUNITS2_INCDIR UDUNITS2_LIBDIR UDUNITS2_XML_PATH

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: pypi-artifacts
name: pypi-artifacts-bdist-${{ matrix.os }}-${{ matrix.arch }}
path: ${{ github.workspace }}/wheelhouse/*.whl


Expand All @@ -106,9 +106,9 @@ jobs:
run: |
pipx run build --sdist
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: pypi-artifacts
name: pypi-artifacts-sdist
path: ${{ github.workspace }}/dist/*.tar.gz


Expand All @@ -117,10 +117,10 @@ jobs:
name: "Show artifacts"
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: pypi-artifacts
path: ${{ github.workspace }}/dist
merge-multiple: true

- shell: bash
run: |
Expand All @@ -134,10 +134,10 @@ jobs:
# upload to Test PyPI for every commit on main branch
if: github.event_name == 'push' && github.event.ref == 'refs/heads/main'
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: pypi-artifacts
path: ${{ github.workspace }}/dist
merge-multiple: true

- uses: pypa/gh-action-pypi-publish@release/v1
with:
Expand All @@ -155,10 +155,10 @@ jobs:
# upload to PyPI for every tag starting with 'v'
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: pypi-artifacts
path: ${{ github.workspace }}/dist
merge-multiple: true

- uses: pypa/gh-action-pypi-publish@release/v1
with:
Expand Down

0 comments on commit 4085387

Please sign in to comment.