Fix matching requested version with Git tag in GHA

abhinavsingh · Nov 27, 2021 · 42c6070 · 42c6070
1 parent c5dd39a
commit 42c6070
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/.github/workflows/test-library.yml b/.github/workflows/test-library.yml
@@ -266,13 +266,15 @@ jobs:
     - name: Setup git user as [bot]
       if: >-
         fromJSON(needs.pre-setup.outputs.is-untagged-devel)
+        && fromJSON(needs.pre-setup.outputs.release-requested)
       uses: fregante/setup-git-user@v1.0.1
     - name: >-
         Tag the release in the local Git repo
         as ${{ needs.pre-setup.outputs.git-tag }}
-        for setuptools-scm to se the desired version
+        for setuptools-scm to set the desired version
       if: >-
         fromJSON(needs.pre-setup.outputs.is-untagged-devel)
+        && fromJSON(needs.pre-setup.outputs.release-requested)
       run: >-
         git tag
         -m '${{ needs.pre-setup.outputs.git-tag }}'
@@ -783,7 +785,10 @@ jobs:
         Tag the release in the local Git repo
         as v${{ needs.pre-setup.outputs.git-tag }}
       run: >-
-        git tag '${{ needs.pre-setup.outputs.git-tag }}'
+        git tag
+        -m '${{ needs.pre-setup.outputs.git-tag }}'
+        '${{ needs.pre-setup.outputs.git-tag }}'
+        --
         ${{ github.event.inputs.release-commitish }}
     - name: >-
         Push ${{ needs.pre-setup.outputs.git-tag }} tag corresponding