Skip to content

Commit 91518e2

Browse files
committed
refactor, remove RC
1 parent 62a0072 commit 91518e2

File tree

4 files changed

+12
-25
lines changed

4 files changed

+12
-25
lines changed

.github/workflows/nightly-pypi-build.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
runs-on: ubuntu-latest
3131
outputs:
3232
VERSION: ${{ steps.set-version.outputs.VERSION }}
33-
RC: ${{ steps.set-version.outputs.RC }}
3433
steps:
3534
- uses: actions/checkout@v4
3635
with:
@@ -43,24 +42,21 @@ jobs:
4342
- name: Install Poetry
4443
run: make install-poetry
4544

46-
- name: Extract version and rc
45+
- name: Set version
4746
id: set-version
4847
run: |
49-
VERSION=$(poetry version --short)
50-
RC="$(date +%Y%m%d)"
51-
echo "VERSION=$VERSION" >> "$GITHUB_OUTPUT"
52-
echo "RC=$RC" >> "$GITHUB_OUTPUT"
48+
CURRENT_VERSION=$(poetry version --short)
49+
TIMESTAMP=$(date +%Y%m%d%H%M%S)
50+
echo "VERSION=${CURRENT_VERSION}.dev${TIMESTAMP}" >> "$GITHUB_OUTPUT"
5351
54-
- name: Debug version and rc
55-
run: echo "Publishing version ${{ steps.set-version.outputs.VERSION }}rc${{ steps.set-version.outputs.RC }}"
52+
- name: Debug version
53+
run: echo "Publishing version ${{ steps.set-version.outputs.VERSION }}"
5654

5755
nightly-build:
5856
needs: set-version
5957
uses: ./.github/workflows/pypi-build-artifacts.yml
6058
with:
61-
version: ${{ needs.set-version.outputs.VERSION }} # i.e. 0.9.0
62-
rc: ${{ needs.set-version.outputs.RC }} # i.e. 20250203
63-
59+
version: ${{ needs.set-version.outputs.VERSION }}
6460
testpypi-publish:
6561
name: Publish to TestPypi
6662
needs:

.github/workflows/pypi-build-artifacts.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ on:
2525
VERSION:
2626
required: true
2727
type: string
28-
RC:
29-
required: true
30-
type: string
3128

3229
jobs:
3330
pypi-build-artifacts:
@@ -56,8 +53,7 @@ jobs:
5653
- name: Set version with RC
5754
env:
5855
VERSION: ${{ inputs.VERSION }}
59-
RC: ${{ inputs.RC }}
60-
run: python -m poetry version "${{ env.VERSION }}rc${{ env.RC }}" # e.g., 0.8.0rc1
56+
run: python -m poetry version "${{ env.VERSION }}
6157

6258
# Publish the source distribution with the version that's in
6359
# the repository, otherwise the tests will fail
@@ -97,6 +93,6 @@ jobs:
9793
- name: Merge Artifacts
9894
uses: actions/upload-artifact/merge@v4
9995
with:
100-
name: "pypi-release-candidate-${{ inputs.VERSION }}rc${{ inputs.RC }}"
96+
name: "pypi-release-candidate-${{ inputs.VERSION }}"
10197
pattern: pypi-release-candidate*
10298
delete-merged: true

.github/workflows/python-release.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,7 @@ jobs:
121121
- validate-library-version
122122
uses: ./.github/workflows/svn-build-artifacts.yml
123123
with:
124-
version: ${{ needs.validate-inputs.outputs.VERSION }}
125-
rc: ${{ needs.validate-inputs.outputs.RC }}
124+
version: ${{ needs.validate-inputs.outputs.VERSION }}rc${{ needs.validate-inputs.outputs.RC }}
126125

127126
# PyPi
128127
pypi-build-artifacts:
@@ -131,5 +130,4 @@ jobs:
131130
- validate-library-version
132131
uses: ./.github/workflows/pypi-build-artifacts.yml
133132
with:
134-
version: ${{ needs.validate-inputs.outputs.VERSION }}
135-
rc: ${{ needs.validate-inputs.outputs.RC }}
133+
version: ${{ needs.validate-inputs.outputs.VERSION }}rc${{ needs.validate-inputs.outputs.RC }}

.github/workflows/svn-build-artifacts.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ on:
2525
VERSION:
2626
required: true
2727
type: string
28-
RC:
29-
required: true
30-
type: string
3128

3229
jobs:
3330
svn-build-artifacts:
@@ -91,6 +88,6 @@ jobs:
9188
- name: Merge Artifacts
9289
uses: actions/upload-artifact/merge@v4
9390
with:
94-
name: "svn-release-candidate-${{ inputs.VERSION }}rc${{ inputs.RC }}"
91+
name: "svn-release-candidate-${{ inputs.VERSION }}"
9592
pattern: svn-release-candidate*
9693
delete-merged: true

0 commit comments

Comments
 (0)