Skip to content

Commit b060b51

Browse files
fix: configure unique artifact names for dual-package build
Configure build-and-inspect-python-package to upload artifacts with unique names to prevent naming conflicts when building both vcs-versioning and setuptools-scm: - Added 'upload-name-suffix: -vcs-versioning' to vcs-versioning build - Added 'upload-name-suffix: -setuptools-scm' to setuptools-scm build - Updated all download steps to pull both artifacts into the same dist/ path - Removed combined artifact upload - instead download both artifacts directly where needed This ensures each package uploads its own artifact (Packages-vcs-versioning and Packages-setuptools-scm) and all jobs that need the packages download both artifacts into dist/, allowing them to coexist without conflicts.
1 parent 37ef6a8 commit b060b51

File tree

1 file changed

+32
-27
lines changed

1 file changed

+32
-27
lines changed

.github/workflows/python-tests.yml

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,6 @@ jobs:
4242
with:
4343
upload-name-suffix: -setuptools-scm
4444

45-
- name: Download vcs-versioning packages
46-
uses: actions/download-artifact@v4
47-
with:
48-
name: Packages-vcs-versioning
49-
path: dist/
50-
51-
- name: Download setuptools-scm packages
52-
uses: actions/download-artifact@v4
53-
with:
54-
name: Packages-setuptools-scm
55-
path: dist/
56-
57-
- name: Upload combined packages
58-
uses: actions/upload-artifact@v4
59-
with:
60-
name: All-Packages
61-
path: dist/
62-
if-no-files-found: error
63-
6445
test:
6546
needs: [package]
6647
runs-on: ${{ matrix.os }}
@@ -124,9 +105,15 @@ jobs:
124105
git config --system gpg.program "C:\Program Files (x86)\gnupg\bin\gpg.exe"
125106
if: runner.os == 'Windows'
126107
- run: uv sync --group test --group docs --extra rich
127-
- uses: actions/download-artifact@v4
108+
- name: Download vcs-versioning packages
109+
uses: actions/download-artifact@v4
128110
with:
129-
name: All-Packages
111+
name: Packages-vcs-versioning
112+
path: dist
113+
- name: Download setuptools-scm packages
114+
uses: actions/download-artifact@v4
115+
with:
116+
name: Packages-setuptools-scm
130117
path: dist
131118
- name: Install built wheels
132119
shell: bash
@@ -152,9 +139,15 @@ jobs:
152139
id-token: write
153140
needs: [test]
154141
steps:
155-
- uses: actions/download-artifact@v4
142+
- name: Download vcs-versioning packages
143+
uses: actions/download-artifact@v4
156144
with:
157-
name: All-Packages
145+
name: Packages-vcs-versioning
146+
path: dist
147+
- name: Download setuptools-scm packages
148+
uses: actions/download-artifact@v4
149+
with:
150+
name: Packages-setuptools-scm
158151
path: dist
159152
- name: Publish package to PyPI
160153
uses: pypa/gh-action-pypi-publish@release/v1
@@ -166,9 +159,15 @@ jobs:
166159
permissions:
167160
contents: write
168161
steps:
169-
- uses: actions/download-artifact@v4
162+
- name: Download vcs-versioning packages
163+
uses: actions/download-artifact@v4
164+
with:
165+
name: Packages-vcs-versioning
166+
path: dist
167+
- name: Download setuptools-scm packages
168+
uses: actions/download-artifact@v4
170169
with:
171-
name: All-Packages
170+
name: Packages-setuptools-scm
172171
path: dist
173172
- name: Upload release assets
174173
uses: softprops/action-gh-release@v2
@@ -183,9 +182,15 @@ jobs:
183182
permissions:
184183
id-token: write
185184
steps:
186-
- uses: actions/download-artifact@v4
185+
- name: Download vcs-versioning packages
186+
uses: actions/download-artifact@v4
187+
with:
188+
name: Packages-vcs-versioning
189+
path: dist
190+
- name: Download setuptools-scm packages
191+
uses: actions/download-artifact@v4
187192
with:
188-
name: All-Packages
193+
name: Packages-setuptools-scm
189194
path: dist
190195
- name: Publish package to PyPI
191196
continue-on-error: true

0 commit comments

Comments
 (0)