Skip to content

Commit f55cc3f

Browse files
committed
reorder operations
1 parent c5cd69f commit f55cc3f

File tree

1 file changed

+24
-22
lines changed

1 file changed

+24
-22
lines changed

.github/workflows/python-release.yml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# under the License.
1818
#
1919

20-
name: "Python Release"
20+
name: "Python Release RC"
2121

2222
on:
2323
workflow_dispatch:
@@ -35,7 +35,7 @@ jobs:
3535
validate-inputs:
3636
runs-on: ubuntu-latest
3737
steps:
38-
- name: Validate Version and RC
38+
- name: Validate Input Version and RC
3939
id: validate
4040
run: |
4141
# Validate version (e.g., 1.0.0)
@@ -50,7 +50,7 @@ jobs:
5050
exit 1
5151
fi
5252
53-
- name: Release Version
53+
- name: Echo Release Version
5454
run: |
5555
echo "Running Release Version: ${{ github.event.inputs.version }}${{ github.event.inputs.rc }}"
5656
@@ -84,7 +84,8 @@ jobs:
8484
exit 1
8585
fi
8686
87-
build_svn_artifacts:
87+
# SVN
88+
svn_build_artifacts:
8889
name: Build artifacts for SVN on ${{ matrix.os }}
8990
runs-on: ${{ matrix.os }}
9091
needs:
@@ -139,12 +140,11 @@ jobs:
139140
run: ls -lah dist/* && cp dist/* svn_wheelhouse/
140141

141142
- name: Generate SHA512 checksums
142-
if: startsWith(matrix.os, 'ubuntu')
143143
run: |
144144
cd svn_wheelhouse
145145
for name in $(ls pyiceberg-*.whl pyiceberg-*.tar.gz)
146146
do
147-
shasum -a 512 "${name}" > "${name}.sha512"
147+
shasum -a 512 "${name}" > "${name}.sha512"
148148
done
149149
150150
- name: Import GPG Key
@@ -155,20 +155,32 @@ jobs:
155155
passphrase: ${{ secrets.GPG_PASSPHRASE }}
156156

157157
- name: Generate GPG signatures
158-
if: startsWith(matrix.os, 'ubuntu')
159158
run: |
160159
cd svn_wheelhouse
161160
for name in $(ls pyiceberg-*.whl pyiceberg-*.tar.gz)
162161
do
163-
gpg --yes --armor --output "${name}.asc" --detach-sig "${name}"
162+
gpg --yes --armor --output "${name}.asc" --detach-sig "${name}"
164163
done
165164
165+
# TODO: upload to SVN, all files in pypi_wheelhouse
166166
- uses: actions/upload-artifact@v4
167167
with:
168168
name: "release-svn-${{ matrix.os }}"
169169
path: ./svn_wheelhouse/*
170170

171-
build_pypi_artifacts:
171+
svn_merge_artifacts:
172+
runs-on: ubuntu-latest
173+
needs: svn_build_artifacts
174+
steps:
175+
- name: Merge Artifacts
176+
uses: actions/upload-artifact/merge@v4
177+
with:
178+
name: "release-svn-${{ github.event.inputs.version }}${{ github.event.inputs.rc }}"
179+
pattern: release-svn*
180+
delete-merged: true
181+
182+
# PyPi
183+
pypi_build_artifacts:
172184
name: Build artifacts for PyPi on ${{ matrix.os }}
173185
runs-on: ${{ matrix.os }}
174186
needs:
@@ -225,25 +237,15 @@ jobs:
225237
if: startsWith(matrix.os, 'ubuntu')
226238
run: ls -lah dist/* && cp dist/* pypi_wheelhouse/
227239

240+
# TODO: upload to PyPi, all files in pypi_wheelhouse
228241
- uses: actions/upload-artifact@v4
229242
with:
230243
name: "release-pypi-${{ matrix.os }}"
231244
path: ./pypi_wheelhouse/*
232245

233-
merge_svn_artifacts:
234-
runs-on: ubuntu-latest
235-
needs: build_svn_artifacts
236-
steps:
237-
- name: Merge Artifacts
238-
uses: actions/upload-artifact/merge@v4
239-
with:
240-
name: "release-svn-${{ github.event.inputs.version }}${{ github.event.inputs.rc }}"
241-
pattern: release-svn*
242-
delete-merged: true
243-
244-
merge_pypi_artifacts:
246+
pypi_merge_artifacts:
245247
runs-on: ubuntu-latest
246-
needs: build_pypi_artifacts
248+
needs: pypi_build_artifacts
247249
steps:
248250
- name: Merge Artifacts
249251
uses: actions/upload-artifact/merge@v4

0 commit comments

Comments
 (0)