Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deploy to use the right environment & token permissions #4328

Merged
merged 1 commit into from
Oct 31, 2023
Merged

Fix deploy to use the right environment & token permissions #4328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 61 additions & 7 deletions .github/workflows/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,16 @@ jobs:
path: testsuite/dist/*.tar.gz
retention-days: 7

upload_testpypi:
upload_testpypi_mdanalysis:
if: |
github.repository == 'MDAnalysis/mdanalysis' &&
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package'))
name: testpypi upload
environment: deploy
name: testpypi_upload_mdanalysis
environment:
name: deploy
url: https://test.pypi.org/p/mdanalysis
permissions:
id-token: write
runs-on: ubuntu-latest
needs: [build_wheels, build_sdist, build_sdist_tests]
steps:
Expand All @@ -142,19 +146,46 @@ jobs:
skip_existing: true
repository_url: https://test.pypi.org/legacy/

upload_testpypi_mdanalysistests:
if: |
github.repository == 'MDAnalysis/mdanalysis' &&
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/package'))
name: testpypi_upload_mdanalysistests
environment:
name: deploy
url: https://test.pypi.org/p/mdanalysis
permissions:
id-token: write
runs-on: ubuntu-latest
needs: [build_wheels, build_sdist, build_sdist_tests]
steps:
- uses: actions/download-artifact@v3
with:
name: artifact
path: dist

- name: move_test_dist
run: |
mkdir -p testsuite/dist
mv dist/MDAnalysisTests-* testsuite/dist

- name: upload_tests
uses: pypa/[email protected]
with:
packages_dir: testsuite/dist
skip_existing: true
repository_url: https://test.pypi.org/legacy/

upload_pypi:
upload_pypi_mdanalysis:
if: |
github.repository == 'MDAnalysis/mdanalysis' &&
github.event_name == 'release' && github.event.action == 'published'
name: pypi upload
environment: deploy
name: pypi_upload_mdanalysis
environment:
name: deploy
url: https://pypi.org/p/mdanalysis
permissions:
id-token: write
runs-on: ubuntu-latest
needs: [build_wheels, build_sdist, build_sdist_tests]
steps:
Expand All @@ -171,6 +202,29 @@ jobs:
- name: upload_source_and_wheels
uses: pypa/[email protected]

upload_pypi_mdanalysistests:
if: |
github.repository == 'MDAnalysis/mdanalysis' &&
github.event_name == 'release' && github.event.action == 'published'
name: pypi_upload_mdanalysistests
environment:
name: deploy
url: https://pypi.org/p/mdanalysistests
permissions:
id-token: write
runs-on: ubuntu-latest
needs: [build_wheels, build_sdist, build_sdist_tests]
steps:
- uses: actions/download-artifact@v3
with:
name: artifact
path: dist

- name: move_test_dist
run: |
mkdir -p testsuite/dist
mv dist/MDAnalysisTests-* testsuite/dist

- name: upload_tests
uses: pypa/[email protected]
with:
Expand All @@ -183,7 +237,7 @@ jobs:
name: testpypi check
runs-on: ${{ matrix.os }}
timeout-minutes: 60
needs: upload_testpypi
needs: [upload_testpypi_mdanalysis, upload_testpypi_mdanalysistests]
strategy:
fail-fast: false
matrix:
Expand Down
Loading