From 2de1fa1f975c91b4be73c00a8db7c15e6f5698e2 Mon Sep 17 00:00:00 2001
From: Tomas Peterka <tomas@peterka.me>
Date: Wed, 7 Feb 2024 15:37:18 +0100
Subject: [PATCH] fix(ci): solve the problem that tag made by workflow cannot
 trigger

---
 .github/workflows/release-python.yaml | 40 ++++++++++++++++-----------
 .github/workflows/release.yml         |  5 ++--
 pyproject.toml                        |  2 +-
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/release-python.yaml b/.github/workflows/release-python.yaml
index c39902c..f628915 100644
--- a/.github/workflows/release-python.yaml
+++ b/.github/workflows/release-python.yaml
@@ -1,43 +1,51 @@
 name: "[auto] release-python"
 
 on:
-  push:
-    tags:
-      - v*
+  workflow_dispatch:  # be able to manually re-run
+  workflow_run:
+    workflows: ["Release"]
+    types:
+      - completed
 
 env:
-  PYTHON_VERSION: "3.10"
+  PYTHON_VERSION: "3.11"
 
 jobs:
-  build:
+  release:
     name: Release new version to PyPI
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-tags: 'true'
+
       - name: Check version format vMAJOR.MINOR.PATCH(-SUFFIX)
+        id: version
         run: |
-          if [[ ! "$GITHUB_REF_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+(\.[a-zA-Z0-9]+)*)?$ ]]; then
-            echo "Invalid version format. Expected vMAJOR.MINOR.PATCH(-SUFFIX)?, got ${GITHUB_REF_NAME}"
+          RELEASE_TAG=$(git tag --points-at HEAD)
+          echo "RELEASE_TAG: $RELEASE_TAG"
+          if [[ ! "$RELEASE_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+(\.[a-zA-Z0-9]+)*)?$ ]]; then
+            echo "Invalid version format. Expected vMAJOR.MINOR.PATCH(-SUFFIX)?, got ${RELEASE_TAG}"
             exit 1
           fi
+          echo "version=${RELEASE_TAG#v}" >> $GITHUB_OUTPUT
 
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install the project
+      - name: Release
         uses: dronetag/actions/release-python@main
         with:
           pypi_name: dronetag
           pypi_host: ${{ secrets.PRIV_PIP_HOST }}
           pypi_user: ${{ secrets.PRIV_PIP_USER }}
           pypi_pass: ${{ secrets.PRIV_PIP_PASSWORD }}
-          version: "${GITHUB_REF_NAME#v}"
+          version: ${{ steps.version.outputs.version }}
 
       - name: Commit version on release branch
         run: |
-          if [[ $(git rev-parse heads/main) = $(git rev-parse ${GITHUB_REF}) ]]; then
-            echo "We are at the top of main branch so we can commit the version bump"
-            git checkout main
+          if [[ $(git rev-parse heads/main) = $(git rev-parse HEAD) ]]; then
+            git checkout main  # in case we are on tag
+            sed -i "s/version = .*/version = \"${{ steps.version.outputs.version }}\"/g" pyproject.toml
             git add pyproject.toml
-            git commit -m "Release ${GITHUB_REF_NAME#v} [skip ci]"
+            git commit -m "Release ${{ steps.version.outputs.version }} [skip ci]"
             git push
           fi
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 58d6952..397378c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,4 @@
-name: "RELEASE"
+name: "Release"
 
 on:
   workflow_dispatch:
@@ -16,8 +16,9 @@ jobs:
       uses: dronetag/actions/get-next-version@main
       id: get-next-version
 
-    - name: Create the tag
+    - name: Create the tag (if it does not exist yet)
       run: |
+        git show-ref --tags --verify --quiet "refs/tags/v${{ steps.get-next-version.outputs.version }}" && exit 0
         git config --local user.email "" && git config --local user.name "GitHub Action"
         git tag v${{ steps.get-next-version.outputs.version }}
         git push origin v${{ steps.get-next-version.outputs.version }}
diff --git a/pyproject.toml b/pyproject.toml
index 82a0c96..057393a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools >= 61.0"]
+requires = ["setuptools >= 59.0"]
 build-backend = "setuptools.build_meta"
 
 [project]