Attempt #10

.github/workflows/publish-to-pypi.yml

@@ -1,23 +1,57 @@
 name: Publish Python Distribution to PyPI
 
 on:
-  workflow_call:
-    inputs:
-      new-release-tag:
-        required: true
-        type: string
-    secrets:
-      token:
-        required: true
+  push:
+    branches:
+      - main
 
 
 jobs:
+  version-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Get Latest Tag
+        id: get-latest-tag
+        uses: actions-ecosystem/[email protected]
+        with:
+          semver_only: true
+          with_initial_version: false
+      - name: Code vs Releases Version Check
+        id: release-info
+        run: |
+          RELEASE_VERSION=$(echo $LATEST_RELEASE | tr -d "v ")
+          VERSION=$(cat diplomat/__init__.py | grep "__version__" | cut -d "=" -f 2 | tr -d '" ')
+          if ! [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]
+            then
+              echo "$VERSION is not a valid version!"
+              exit 1
+          fi
+          PROPOSED_TAG="v$VERSION"
+          echo "Python package version: $VERSION"
+          echo "Github release version: $RELEASE_VERSION"
+          echo "Next proposed tag: $PROPOSED_TAG"
+          echo "PYTHON_VERSION=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "RELEASE_VERSION=$RELEASE_VERSION" >> "$GITHUB_OUTPUT"
+          echo "NEXT_TAG=$PROPOSED_TAG" >> "$GITHUB_OUTPUT"
+        env:
+          LATEST_RELEASE: ${{ steps.get-latest-tag.outputs.tag }}
+    outputs:
+      RELEASE_VERSION: ${{ steps.release-info.outputs.RELEASE_VERSION }}
+      PYTHON_VERSION: ${{ steps.release-info.outputs.PYTHON_VERSION }}
+      NEXT_TAG: ${{ steps.release-info.outputs.NEXT_TAG }}
+
+
   build:
     name: Build distribution
+    needs:
+      - version-check
+    if: "${{ needs.version-check.outputs.RELEASE_VERSION != needs.version-check.outputs.PYTHON_VERSION }}"
     runs-on: ubuntu-latest
 
     steps:
-    #- uses: actions/checkout@v4
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
@@ -33,6 +67,9 @@ jobs:
         name: python-package-distributions
         path: dist/
 
+    outputs:
+      NEXT_TAG: "${{ needs.version-check.outputs.NEXT_TAG }}"
+
 
   publish-to-pypi:
     name: Publish Python distribution to PyPI
@@ -52,6 +89,8 @@ jobs:
           path: dist/
       - name: Publish distribution to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
+    outputs:
+      NEXT_TAG: "${{ needs.build.outputs.NEXT_TAG }}"
 
 
   github-release:
@@ -81,8 +120,8 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
         run: >-
           gh release create
-          '${{ inputs.new-release-tag }}'
-          --title 'DIPLOMAT Release ${{ inputs.new-release-tag }}'
+          '${{ needs.publish-to-pypi.outputs.NEXT_TAG }}'
+          --title 'DIPLOMAT Release ${{ needs.publish-to-pypi.outputs.NEXT_TAG }}'
           --repo '${{ github.repository }}'
           --notes-file "RELEASE_NOTES.md"
       - name: Upload artifact signatures to GitHub Release
@@ -93,5 +132,5 @@ jobs:
         # sigstore-produced signatures and certificates.
         run: >-
           gh release upload
-          '${{ inputs.new-release-tag }}' dist/**
+          '${{ needs.publish-to-pypi.outputs.NEXT_TAG }}' dist/**
           --repo '${{ github.repository }}'