refactor, remove RC

apache · Feb 6, 2025 · 9ecc1ff · 9ecc1ff
1 parent 62a0072
commit 9ecc1ff
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 23 deletions.
diff --git a/.github/workflows/nightly-pypi-build.yml b/.github/workflows/nightly-pypi-build.yml
@@ -30,7 +30,6 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       VERSION: ${{ steps.set-version.outputs.VERSION }}
-      RC: ${{ steps.set-version.outputs.RC }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -43,23 +42,21 @@ jobs:
       - name: Install Poetry
         run: make install-poetry
 
-      - name: Extract version and rc
+      - name: Set version
         id: set-version
         run: |
-          VERSION=$(poetry version --short)
-          RC="$(date +%Y%m%d)"
-          echo "VERSION=$VERSION" >> "$GITHUB_OUTPUT"
-          echo "RC=$RC" >> "$GITHUB_OUTPUT"
+          CURRENT_VERSION=$(poetry version --short)
+          TIMESTAMP=$(date +%Y%m%d%H%M%S)
+          echo "VERSION=${CURRENT_VERSION}.dev${TIMESTAMP}" >> "$GITHUB_ENV"
 
-      - name: Debug version and rc
-        run: echo "Publishing version ${{ steps.set-version.outputs.VERSION }}rc${{ steps.set-version.outputs.RC }}"
+      - name: Debug version
+        run: echo "Publishing version ${{ steps.set-version.outputs.VERSION }}"
 
   nightly-build:
     needs: set-version
     uses: ./.github/workflows/pypi-build-artifacts.yml
     with:
       version: ${{ needs.set-version.outputs.VERSION }}  # i.e. 0.9.0
-      rc: ${{ needs.set-version.outputs.RC }}  # i.e. 20250203
 
   testpypi-publish:
     name: Publish to TestPypi

diff --git a/.github/workflows/pypi-build-artifacts.yml b/.github/workflows/pypi-build-artifacts.yml
@@ -25,9 +25,6 @@ on:
       VERSION:
         required: true
         type: string
-      RC:
-        required: true
-        type: string
 
 jobs:
   pypi-build-artifacts:
@@ -56,8 +53,7 @@ jobs:
       - name: Set version with RC
         env:
           VERSION: ${{ inputs.VERSION }}
-          RC: ${{ inputs.RC }}
-        run: python -m poetry version "${{ env.VERSION }}rc${{ env.RC }}" # e.g., 0.8.0rc1
+        run: python -m poetry version "${{ env.VERSION }}
 
       # Publish the source distribution with the version that's in
       # the repository, otherwise the tests will fail
@@ -97,6 +93,6 @@ jobs:
       - name: Merge Artifacts
         uses: actions/upload-artifact/merge@v4
         with:
-          name: "pypi-release-candidate-${{ inputs.VERSION }}rc${{ inputs.RC }}"
+          name: "pypi-release-candidate-${{ inputs.VERSION }}
           pattern: pypi-release-candidate*
           delete-merged: true
diff --git a/.github/workflows/python-release.yml b/.github/workflows/python-release.yml
@@ -121,8 +121,7 @@ jobs:
       - validate-library-version
     uses: ./.github/workflows/svn-build-artifacts.yml
     with:
-      version: ${{ needs.validate-inputs.outputs.VERSION }}
-      rc: ${{ needs.validate-inputs.outputs.RC }}
+      version: ${{ needs.validate-inputs.outputs.VERSION }}rc${{ needs.validate-inputs.outputs.RC }}
 
   # PyPi
   pypi-build-artifacts:
@@ -131,5 +130,4 @@ jobs:
       - validate-library-version
     uses: ./.github/workflows/pypi-build-artifacts.yml
     with:
-      version: ${{ needs.validate-inputs.outputs.VERSION }}
-      rc: ${{ needs.validate-inputs.outputs.RC }}
+      version: ${{ needs.validate-inputs.outputs.VERSION }}rc${{ needs.validate-inputs.outputs.RC }}
diff --git a/.github/workflows/svn-build-artifacts.yml b/.github/workflows/svn-build-artifacts.yml
@@ -25,9 +25,6 @@ on:
       VERSION:
         required: true
         type: string
-      RC:
-        required: true
-        type: string
 
 jobs:
   svn-build-artifacts:
@@ -91,6 +88,6 @@ jobs:
       - name: Merge Artifacts
         uses: actions/upload-artifact/merge@v4
         with:
-          name: "svn-release-candidate-${{ inputs.VERSION }}rc${{ inputs.RC }}"
+          name: "svn-release-candidate-${{ inputs.VERSION }}
           pattern: svn-release-candidate*
           delete-merged: true