Skip to content

Commit 038386f

Browse files
committed
Add dist_version parameter
This way we can support branches while uploading/publishing artifacts
1 parent e7d9e08 commit 038386f

1 file changed

Lines changed: 24 additions & 20 deletions

File tree

.github/workflows/build.yaml

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
description: 'Commit reference from CPython repository'
77
required: true
88
default: '3.14'
9+
dist_version:
10+
description: 'Dist version (compatible with patchlevel.py output)'
11+
required: true
12+
default: '3.14'
913
permissions:
1014
contents: write
1115
jobs:
@@ -52,47 +56,47 @@ jobs:
5256
- uses: actions/upload-artifact@master
5357
with:
5458
name: docs-pdf-a4.zip
55-
path: ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-pdf-a4.zip
59+
path: ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-pdf-a4.zip
5660
if-no-files-found: ignore
5761
- uses: actions/upload-artifact@master
5862
with:
5963
name: docs-pdf-a4.tar.bz2
60-
path: ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-pdf-a4.tar.bz2
64+
path: ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-pdf-a4.tar.bz2
6165
if-no-files-found: ignore
6266
- uses: actions/upload-artifact@master
6367
with:
6468
name: docs-html.zip
65-
path: ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-html.zip
69+
path: ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-html.zip
6670
if-no-files-found: ignore
6771
- uses: actions/upload-artifact@master
6872
with:
6973
name: docs-html.tar.bz2
70-
path: ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-html.tar.bz2
74+
path: ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-html.tar.bz2
7175
if-no-files-found: ignore
7276
- uses: actions/upload-artifact@master
7377
with:
7478
name: docs-text.zip
75-
path: ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-text.zip
79+
path: ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-text.zip
7680
if-no-files-found: ignore
7781
- uses: actions/upload-artifact@master
7882
with:
7983
name: docs-text.tar.bz2
80-
path: ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-text.tar.bz2
84+
path: ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-text.tar.bz2
8185
if-no-files-found: ignore
8286
- uses: actions/upload-artifact@master
8387
with:
8488
name: docs-texinfo.zip
85-
path: ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-texinfo.zip
89+
path: ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-texinfo.zip
8690
if-no-files-found: ignore
8791
- uses: actions/upload-artifact@master
8892
with:
8993
name: docs-texinfo.tar.bz2
90-
path: ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-texinfo.tar.bz2
94+
path: ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-texinfo.tar.bz2
9195
if-no-files-found: ignore
9296
- uses: actions/upload-artifact@master
9397
with:
9498
name: docs.epub
95-
path: ./Doc/dist/python-${{ github.event.inputs.reference }}-docs.epub
99+
path: ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs.epub
96100
if-no-files-found: ignore
97101
- name: Checkout gh-pages branch
98102
uses: actions/checkout@v4
@@ -103,31 +107,31 @@ jobs:
103107
run: |
104108
mkdir -p gh-pages/3
105109
# PDF
106-
cp ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-pdf-a4.zip gh-pages/3/python-${{ github.event.inputs.reference }}-docs-pdf-a4.zip 2>/dev/null || true
107-
cp ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-pdf-a4.tar.bz2 gh-pages/3/python-${{ github.event.inputs.reference }}-docs-pdf-a4.tar.bz2 2>/dev/null || true
110+
cp ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-pdf-a4.zip gh-pages/3/python-${{ github.event.inputs.dist_version }}-docs-pdf-a4.zip 2>/dev/null || true
111+
cp ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-pdf-a4.tar.bz2 gh-pages/3/python-${{ github.event.inputs.dist_version }}-docs-pdf-a4.tar.bz2 2>/dev/null || true
108112
# HTML
109-
cp ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-html.zip gh-pages/3/python-${{ github.event.inputs.reference }}-docs-html.zip 2>/dev/null || true
110-
cp ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-html.tar.bz2 gh-pages/3/python-${{ github.event.inputs.reference }}-docs-html.tar.bz2 2>/dev/null || true
113+
cp ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-html.zip gh-pages/3/python-${{ github.event.inputs.dist_version }}-docs-html.zip 2>/dev/null || true
114+
cp ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-html.tar.bz2 gh-pages/3/python-${{ github.event.inputs.dist_version }}-docs-html.tar.bz2 2>/dev/null || true
111115
# Text
112-
cp ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-text.zip gh-pages/3/python-${{ github.event.inputs.reference }}-docs-text.zip 2>/dev/null || true
113-
cp ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-text.tar.bz2 gh-pages/3/python-${{ github.event.inputs.reference }}-docs-text.tar.bz2 2>/dev/null || true
116+
cp ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-text.zip gh-pages/3/python-${{ github.event.inputs.dist_version }}-docs-text.zip 2>/dev/null || true
117+
cp ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-text.tar.bz2 gh-pages/3/python-${{ github.event.inputs.dist_version }}-docs-text.tar.bz2 2>/dev/null || true
114118
# Texinfo
115-
cp ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-texinfo.zip gh-pages/3/python-${{ github.event.inputs.reference }}-docs-texinfo.zip 2>/dev/null || true
116-
cp ./Doc/dist/python-${{ github.event.inputs.reference }}-docs-texinfo.tar.bz2 gh-pages/3/python-${{ github.event.inputs.reference }}-docs-texinfo.tar.bz2 2>/dev/null || true
119+
cp ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-texinfo.zip gh-pages/3/python-${{ github.event.inputs.dist_version }}-docs-texinfo.zip 2>/dev/null || true
120+
cp ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs-texinfo.tar.bz2 gh-pages/3/python-${{ github.event.inputs.dist_version }}-docs-texinfo.tar.bz2 2>/dev/null || true
117121
# EPUB
118-
cp ./Doc/dist/python-${{ github.event.inputs.reference }}-docs.epub gh-pages/3/python-${{ github.event.inputs.reference }}-docs.epub 2>/dev/null || true
122+
cp ./Doc/dist/python-${{ github.event.inputs.dist_version }}-docs.epub gh-pages/3/python-${{ github.event.inputs.dist_version }}-docs.epub 2>/dev/null || true
119123
- name: Commit generated archives
120124
id: commit
121125
run: |
122126
cd gh-pages
123127
git config user.name github-actions
124128
git config user.email github-actions@github.com
125-
git add 3/python-${{ github.event.inputs.reference }}-docs-* || true
129+
git add 3/python-${{ github.event.inputs.dist_version }}-docs-* || true
126130
if git diff --cached --quiet; then
127131
echo "No documentation archives to commit"
128132
echo "has_changes=false" >> $GITHUB_OUTPUT
129133
else
130-
git commit -m "Update documentation archives for ${{ github.event.inputs.reference }}"
134+
git commit -m "Update documentation archives for ${{ github.event.inputs.dist_version }}"
131135
echo "has_changes=true" >> $GITHUB_OUTPUT
132136
fi
133137
- name: Push commit

0 commit comments

Comments
 (0)