From 1ef704e0ad5ba86cd7f2548f62a04357cbef86b7 Mon Sep 17 00:00:00 2001
From: s-weigand <s.weigand.phy@gmail.com>
Date: Fri, 6 Nov 2020 15:48:44 +0100
Subject: [PATCH] Split up git user setup, tag creation and tag pushing in
 separate tasks

See https://github.com/pypa/gh-action-pypi-publish/pull/45#discussion_r517258942
---
 .github/workflows/publish-major-minor.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish-major-minor.yml b/.github/workflows/publish-major-minor.yml
index ac81403..6a12411 100644
--- a/.github/workflows/publish-major-minor.yml
+++ b/.github/workflows/publish-major-minor.yml
@@ -33,20 +33,28 @@ jobs:
           print("Creating new major and minor tags!")
           print(f"::set-output name=original_tag_name::{tag_name}")
           print(f"::set-output name=major_version::v{version.major}")
-          print(f"::set-output name=minor_version::v{version.major}.{version.minor}")
-      - name: Push Tags Version
+          print(f"::set-output name=minor_version::v{version.major}.{version.minor}")      
+      - name: Setup git user as [bot]
+        run: |
+          git config user.email 'github-actions[bot]@users.noreply.github.com'
+          git config user.name 'github-actions[bot]'
+      - name: Create major + minor tags
         if: steps.get_versions.outputs.original_tag_name != ''
         env:
           original_tag_name: ${{ steps.get_versions.outputs.original_tag_name }}
           major_version: ${{ steps.get_versions.outputs.major_version }}
           minor_version: ${{ steps.get_versions.outputs.minor_version }}
         run: |
-          git config user.email 'github-actions[bot]@users.noreply.github.com'
-          git config user.name 'github-actions[bot]'
           git tag --annotate '${{ env.major_version }}' \
             --message='original tag: ${{ env.original_tag_name }}'
           git tag --annotate '${{ env.minor_version }}' \
             --message='original tag: ${{ env.original_tag_name }}'
+      - name: Push major + minor tags
+        if: steps.get_versions.outputs.original_tag_name != ''
+        env:
+          major_version: ${{ steps.get_versions.outputs.major_version }}
+          minor_version: ${{ steps.get_versions.outputs.minor_version }}
+        run: |
           git push --force --atomic origin \
             '${{ env.major_version }}' \
             '${{ env.minor_version }}'