Skip to content

Commit f10c99a

Browse files
kevinbackhousekevinbackhouse
authored
Merge pull request #85 from kevinbackhouse/split-publish-workflows
Split publish workflows into two jobs
2 parents 027d08e + f2e1a9d commit f10c99a

2 files changed

Lines changed: 78 additions & 45 deletions

File tree

‎.github/workflows/publish-to-pypi.yaml‎

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,22 @@ on:
66
- v[0-9]+.[0-9]+.[0-9]+
77

88
jobs:
9-
publish:
10-
name: Build
9+
build:
10+
name: Build distribution
1111
runs-on: ubuntu-latest
1212

13-
# This environment is required as an input to pypa/gh-action-pypi-publish
14-
environment:
15-
name: pypi
16-
url: https://pypi.org/p/seclab-taskflows
17-
18-
env:
19-
GITHUB_REPO: ${{ github.repository }}
2013

2114
permissions:
22-
contents: write
23-
id-token: write # For trusted publishing
24-
attestations: write # For artifact attestation
15+
contents: read
2516

2617
steps:
2718
- name: Checkout repository
28-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
19+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2920
with:
3021
persist-credentials: false
3122

3223
- name: Set up Python
33-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
24+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
3425
with:
3526
python-version: "3.14"
3627

@@ -40,19 +31,44 @@ jobs:
4031
- name: Build the wheel
4132
run: python3 -m hatch build
4233

43-
- name: Attest build provenance
44-
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0
34+
- name: Upload artifacts
35+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
4536
with:
46-
subject-path: ./dist/*
37+
name: python-package-distributions
38+
path: ./dist/
4739

48-
- name: Upload artifacts
49-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
40+
publish:
41+
name: Publish to PyPI
42+
needs: build
43+
runs-on: ubuntu-latest
44+
45+
# This environment is required as an input to pypa/gh-action-pypi-publish
46+
environment:
47+
name: pypi
48+
url: https://pypi.org/p/seclab-taskflows
49+
50+
env:
51+
GITHUB_REPO: ${{ github.repository }}
52+
53+
permissions:
54+
contents: write
55+
id-token: write # For trusted publishing
56+
attestations: write # For artifact attestation
57+
58+
steps:
59+
- name: Download distribution artifacts
60+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
5061
with:
5162
name: python-package-distributions
52-
path: dist/
63+
path: ./dist/
64+
65+
- name: Attest build provenance
66+
uses: actions/attest@v4.1.0 # immutable release
67+
with:
68+
subject-path: ./dist/*
5369

5470
- name: Publish to PyPI
55-
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
71+
uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0
5672
with:
5773
verbose: true
5874

‎.github/workflows/publish-to-testpypi.yaml‎

Lines changed: 41 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,25 @@
1-
name: Publish to TestPyPI
1+
name: Publish Pre-Release to TestPyPI
22

33
on: workflow_dispatch
44

55
jobs:
6-
publish:
7-
name: Build
6+
build:
7+
name: Build distribution
88
runs-on: ubuntu-latest
9-
10-
# This environment is required as an input to pypa/gh-action-pypi-publish
11-
environment:
12-
name: testpypi
13-
url: https://test.pypi.org/p/seclab-taskflows
14-
15-
env:
16-
GITHUB_REPO: ${{ github.repository }}
9+
outputs:
10+
release_name: ${{ steps.create_version_number.outputs.RELEASE_NAME }}
1711

1812
permissions:
19-
contents: write
20-
id-token: write # For trusted publishing
21-
attestations: write # For artifact attestation
13+
contents: read
2214

2315
steps:
2416
- name: Checkout repository
25-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
17+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2618
with:
2719
persist-credentials: false
2820

2921
- name: Set up Python
30-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
22+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
3123
with:
3224
python-version: "3.14"
3325

@@ -52,25 +44,50 @@ jobs:
5244
- name: Build the wheel
5345
run: python3 -m hatch build
5446

55-
- name: Attest build provenance
56-
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0
47+
- name: Upload artifacts
48+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
5749
with:
58-
subject-path: ./dist/*
50+
name: python-package-distributions
51+
path: ./dist/
5952

60-
- name: Upload artifacts
61-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
53+
publish:
54+
name: Publish to TestPyPI
55+
needs: build
56+
runs-on: ubuntu-latest
57+
58+
# This environment is required as an input to pypa/gh-action-pypi-publish
59+
environment:
60+
name: testpypi
61+
url: https://test.pypi.org/p/seclab-taskflows
62+
63+
env:
64+
GITHUB_REPO: ${{ github.repository }}
65+
66+
permissions:
67+
contents: write
68+
id-token: write # For trusted publishing
69+
attestations: write # For artifact attestation
70+
71+
steps:
72+
- name: Download distribution artifacts
73+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
6274
with:
6375
name: python-package-distributions
64-
path: dist/
76+
path: ./dist/
77+
78+
- name: Attest build provenance
79+
uses: actions/attest@v4.1.0 # immutable release
80+
with:
81+
subject-path: ./dist/*
6582

6683
- name: Publish to TestPyPI
67-
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
84+
uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0
6885
with:
6986
repository-url: https://test.pypi.org/legacy/
7087
verbose: true
7188

7289
- name: Create GitHub Release
7390
env:
7491
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
75-
RELEASE_NAME: ${{ steps.create_version_number.outputs.RELEASE_NAME }}
92+
RELEASE_NAME: ${{ needs.build.outputs.release_name }}
7693
run: gh release create $RELEASE_NAME dist/* --repo $GITHUB_REPO --prerelease --generate-notes

0 commit comments

Comments
 (0)