From 9f47332851596be43eb1ff2d3bcb3cfcc65af0fa Mon Sep 17 00:00:00 2001
From: xiaoyifang <yifang.xiao@gmail.com>
Date: Sat, 9 Apr 2022 13:44:00 +0800
Subject: [PATCH] github:fix tag name error

---
 .github/workflows/AutoTag.yml     | 4 ++--
 .github/workflows/macos-6.2.yml   | 2 +-
 .github/workflows/macos-m1.yml    | 2 +-
 .github/workflows/macos.yml       | 2 +-
 .github/workflows/ubuntu-6.2.yml  | 2 +-
 .github/workflows/ubuntu.yml      | 2 +-
 .github/workflows/windows-6.2.yml | 4 ++--
 .github/workflows/windows.yml     | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/AutoTag.yml b/.github/workflows/AutoTag.yml
index 1c0787d7..a99d631e 100644
--- a/.github/workflows/AutoTag.yml
+++ b/.github/workflows/AutoTag.yml
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v3
             
       - name: set git short sha
-        id: git
+        id: vars
         run: |
           echo "::set-output name=sha_short::$(git rev-parse --short=8 HEAD)"   
           echo "::set-output name=release_hm::$(date +'%y%m%d%H%M')"             
@@ -46,7 +46,7 @@ jobs:
         uses: mathieudutour/github-tag-action@v6.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          custom_tag: ${{env.version}}.${{ steps.git.outputs.release_hm }}.${{ steps.git.outputs.sha_short }}
+          custom_tag: ${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
 
          
       
\ No newline at end of file
diff --git a/.github/workflows/macos-6.2.yml b/.github/workflows/macos-6.2.yml
index b408ef2a..32afc7ef 100644
--- a/.github/workflows/macos-6.2.yml
+++ b/.github/workflows/macos-6.2.yml
@@ -107,7 +107,7 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ env.targetName }}.dmg
           asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_${{ steps.vars.outputs.sha_short }}.dmg
-          tag: v${{env.version}}.${{ steps.git.outputs.release_hm }}.${{ steps.git.outputs.sha_short }}
+          tag: v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: win-linux-macos-${{steps.vars.outputs.release_date}} 
           prerelease: true
diff --git a/.github/workflows/macos-m1.yml b/.github/workflows/macos-m1.yml
index 9ef8628c..da18a5d8 100644
--- a/.github/workflows/macos-m1.yml
+++ b/.github/workflows/macos-m1.yml
@@ -112,7 +112,7 @@ jobs:
 #           repo_token: ${{ secrets.GITHUB_TOKEN }}
 #           file: ${{ env.targetName }}.dmg
 #           asset_name: ${{ env.targetName }}-M1_${{ matrix.os }}_${{ matrix.qt_ver }}_${{ steps.vars.outputs.sha_short }}.dmg
-#           tag: v${{ steps.autotag.outputs.version }}.${{ steps.git.outputs.release_hm }}.${{ steps.git.outputs.sha_short }}
+#           tag: v${{ steps.autotag.outputs.version }}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
 #           overwrite: true 
 #           release_name: win-ubuntu-macos-${{ github.ref_name }}-${{steps.vars.outputs.release_date}} 
 #           prerelease: true
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index f5b4786d..6cda5a63 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -109,7 +109,7 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ env.targetName }}.dmg
           asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_${{ steps.vars.outputs.sha_short }}.dmg
-          tag: v${{env.version}}.${{ steps.git.outputs.release_hm }}.${{ steps.git.outputs.sha_short }}
+          tag: v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: win-linux-macos-${{steps.vars.outputs.release_date}} 
           prerelease: true
diff --git a/.github/workflows/ubuntu-6.2.yml b/.github/workflows/ubuntu-6.2.yml
index 8879a4bb..6aea8003 100644
--- a/.github/workflows/ubuntu-6.2.yml
+++ b/.github/workflows/ubuntu-6.2.yml
@@ -111,7 +111,7 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.vars.outputs.appname }}
           asset_name: ${{ matrix.qt_ver }}-${{ steps.vars.outputs.appname }}
-          tag: v${{env.version}}.${{ steps.git.outputs.release_hm }}.${{ steps.git.outputs.sha_short }}
+          tag: v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: win-linux-macos-${{steps.vars.outputs.release_date}} 
           prerelease: true
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 7ef06c3b..3b0813e4 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -108,7 +108,7 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.vars.outputs.appname }}
           asset_name: ${{ matrix.qt_ver }}-${{ steps.vars.outputs.appname }}
-          tag: v${{env.version}}.${{ steps.git.outputs.release_hm }}.${{ steps.git.outputs.sha_short }}
+          tag: v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: win-linux-macos-${{steps.vars.outputs.release_date}} 
           prerelease: true
diff --git a/.github/workflows/windows-6.2.yml b/.github/workflows/windows-6.2.yml
index 71874321..2967c56d 100644
--- a/.github/workflows/windows-6.2.yml
+++ b/.github/workflows/windows-6.2.yml
@@ -131,7 +131,7 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.package.outputs.packageName }}.zip
           asset_name: ${{ matrix.qt_ver }}-${{ steps.package.outputs.packageName }}.zip
-          tag: v${{env.version}}.${{ steps.git.outputs.release_hm }}.${{ steps.git.outputs.sha_short }}
+          tag: v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: win-linux-macos-${{steps.vars.outputs.release_date}} 
           prerelease: true
@@ -151,7 +151,7 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: release/${{ env.targetName }}
           asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}
-          tag: v${{env.version}}.${{ steps.git.outputs.release_hm }}.${{ steps.git.outputs.sha_short }}
+          tag: v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: win-linux-macos-${{steps.vars.outputs.release_date}} 
           prerelease: true
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 1f1fecf0..9279542d 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -123,7 +123,7 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.package.outputs.packageName }}.zip
           asset_name: ${{ matrix.qt_ver }}-${{ steps.package.outputs.packageName }}.zip
-          tag: v${{env.version}}.${{ steps.git.outputs.release_hm }}.${{ steps.git.outputs.sha_short }}
+          tag: v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: win-linux-macos-${{steps.vars.outputs.release_date}} 
           prerelease: true
@@ -148,7 +148,7 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: release/${{ env.targetName }}
           asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}
-          tag: v${{env.version}}.${{ steps.git.outputs.release_hm }}.${{ steps.git.outputs.sha_short }}
+          tag: v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: win-linux-macos-${{steps.vars.outputs.release_date}} 
           prerelease: true