Skip to content

Commit e8337ea

Browse files
Copilotm-aciek
andcommitted
Fix artifact name conflicts when building multiple Python versions
Agent-Logs-Url: https://github.com/m-aciek/python-docs-offline/sessions/b711ead3-289d-44de-9c08-8c968aab9f71 Co-authored-by: m-aciek <9288014+m-aciek@users.noreply.github.com>
1 parent 52d9dd3 commit e8337ea

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

.github/workflows/build.yaml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ jobs:
5656
- uses: actions/upload-artifact@master
5757
if: always()
5858
with:
59-
name: docs-html.zip
59+
name: python-${{ inputs.dist_version }}-docs-html.zip
6060
path: ./Doc/dist/python-${{ inputs.dist_version }}-docs-html.zip
6161
if-no-files-found: ignore
6262
- uses: actions/upload-artifact@master
6363
if: always()
6464
with:
65-
name: docs-html.tar.bz2
65+
name: python-${{ inputs.dist_version }}-docs-html.tar.bz2
6666
path: ./Doc/dist/python-${{ inputs.dist_version }}-docs-html.tar.bz2
6767
if-no-files-found: ignore
6868
build-text:
@@ -82,13 +82,13 @@ jobs:
8282
- uses: actions/upload-artifact@master
8383
if: always()
8484
with:
85-
name: docs-text.zip
85+
name: python-${{ inputs.dist_version }}-docs-text.zip
8686
path: ./Doc/dist/python-${{ inputs.dist_version }}-docs-text.zip
8787
if-no-files-found: ignore
8888
- uses: actions/upload-artifact@master
8989
if: always()
9090
with:
91-
name: docs-text.tar.bz2
91+
name: python-${{ inputs.dist_version }}-docs-text.tar.bz2
9292
path: ./Doc/dist/python-${{ inputs.dist_version }}-docs-text.tar.bz2
9393
if-no-files-found: ignore
9494
build-texinfo:
@@ -109,13 +109,13 @@ jobs:
109109
- uses: actions/upload-artifact@master
110110
if: always()
111111
with:
112-
name: docs-texinfo.zip
112+
name: python-${{ inputs.dist_version }}-docs-texinfo.zip
113113
path: ./Doc/dist/python-${{ inputs.dist_version }}-docs-texinfo.zip
114114
if-no-files-found: ignore
115115
- uses: actions/upload-artifact@master
116116
if: always()
117117
with:
118-
name: docs-texinfo.tar.bz2
118+
name: python-${{ inputs.dist_version }}-docs-texinfo.tar.bz2
119119
path: ./Doc/dist/python-${{ inputs.dist_version }}-docs-texinfo.tar.bz2
120120
if-no-files-found: ignore
121121
build-epub:
@@ -135,7 +135,7 @@ jobs:
135135
- uses: actions/upload-artifact@master
136136
if: always()
137137
with:
138-
name: docs.epub
138+
name: python-${{ inputs.dist_version }}-docs.epub
139139
path: ./Doc/dist/python-${{ inputs.dist_version }}-docs.epub
140140
if-no-files-found: ignore
141141
build-pdf:
@@ -156,20 +156,20 @@ jobs:
156156
- uses: actions/upload-artifact@master
157157
if: always()
158158
with:
159-
name: pdf-logs.zip
159+
name: python-${{ inputs.dist_version }}-pdf-logs.zip
160160
path: |
161161
./Doc/build/latex/*.log
162162
./Doc/build/latex/*.tex
163163
- uses: actions/upload-artifact@master
164164
if: always()
165165
with:
166-
name: docs-pdf-a4.zip
166+
name: python-${{ inputs.dist_version }}-docs-pdf-a4.zip
167167
path: ./Doc/dist/python-${{ inputs.dist_version }}-docs-pdf-a4.zip
168168
if-no-files-found: ignore
169169
- uses: actions/upload-artifact@master
170170
if: always()
171171
with:
172-
name: docs-pdf-a4.tar.bz2
172+
name: python-${{ inputs.dist_version }}-docs-pdf-a4.tar.bz2
173173
path: ./Doc/dist/python-${{ inputs.dist_version }}-docs-pdf-a4.tar.bz2
174174
if-no-files-found: ignore
175175
publish:
@@ -190,19 +190,19 @@ jobs:
190190
run: |
191191
mkdir -p gh-pages/3
192192
# PDF
193-
cp artifacts/docs-pdf-a4.zip/python-${{ inputs.dist_version }}-docs-pdf-a4.zip gh-pages/3/ 2>/dev/null || true
194-
cp artifacts/docs-pdf-a4.tar.bz2/python-${{ inputs.dist_version }}-docs-pdf-a4.tar.bz2 gh-pages/3/ 2>/dev/null || true
193+
cp artifacts/python-${{ inputs.dist_version }}-docs-pdf-a4.zip/python-${{ inputs.dist_version }}-docs-pdf-a4.zip gh-pages/3/ 2>/dev/null || true
194+
cp artifacts/python-${{ inputs.dist_version }}-docs-pdf-a4.tar.bz2/python-${{ inputs.dist_version }}-docs-pdf-a4.tar.bz2 gh-pages/3/ 2>/dev/null || true
195195
# HTML
196-
cp artifacts/docs-html.zip/python-${{ inputs.dist_version }}-docs-html.zip gh-pages/3/ 2>/dev/null || true
197-
cp artifacts/docs-html.tar.bz2/python-${{ inputs.dist_version }}-docs-html.tar.bz2 gh-pages/3/ 2>/dev/null || true
196+
cp artifacts/python-${{ inputs.dist_version }}-docs-html.zip/python-${{ inputs.dist_version }}-docs-html.zip gh-pages/3/ 2>/dev/null || true
197+
cp artifacts/python-${{ inputs.dist_version }}-docs-html.tar.bz2/python-${{ inputs.dist_version }}-docs-html.tar.bz2 gh-pages/3/ 2>/dev/null || true
198198
# Text
199-
cp artifacts/docs-text.zip/python-${{ inputs.dist_version }}-docs-text.zip gh-pages/3/ 2>/dev/null || true
200-
cp artifacts/docs-text.tar.bz2/python-${{ inputs.dist_version }}-docs-text.tar.bz2 gh-pages/3/ 2>/dev/null || true
199+
cp artifacts/python-${{ inputs.dist_version }}-docs-text.zip/python-${{ inputs.dist_version }}-docs-text.zip gh-pages/3/ 2>/dev/null || true
200+
cp artifacts/python-${{ inputs.dist_version }}-docs-text.tar.bz2/python-${{ inputs.dist_version }}-docs-text.tar.bz2 gh-pages/3/ 2>/dev/null || true
201201
# Texinfo
202-
cp artifacts/docs-texinfo.zip/python-${{ inputs.dist_version }}-docs-texinfo.zip gh-pages/3/ 2>/dev/null || true
203-
cp artifacts/docs-texinfo.tar.bz2/python-${{ inputs.dist_version }}-docs-texinfo.tar.bz2 gh-pages/3/ 2>/dev/null || true
202+
cp artifacts/python-${{ inputs.dist_version }}-docs-texinfo.zip/python-${{ inputs.dist_version }}-docs-texinfo.zip gh-pages/3/ 2>/dev/null || true
203+
cp artifacts/python-${{ inputs.dist_version }}-docs-texinfo.tar.bz2/python-${{ inputs.dist_version }}-docs-texinfo.tar.bz2 gh-pages/3/ 2>/dev/null || true
204204
# EPUB
205-
cp artifacts/docs.epub/python-${{ inputs.dist_version }}-docs.epub gh-pages/3/ 2>/dev/null || true
205+
cp artifacts/python-${{ inputs.dist_version }}-docs.epub/python-${{ inputs.dist_version }}-docs.epub gh-pages/3/ 2>/dev/null || true
206206
- name: Commit generated archives
207207
id: commit
208208
run: |

0 commit comments

Comments
 (0)