From e28894549cb89199c35e32017827de8b4bf0a2db Mon Sep 17 00:00:00 2001
From: shoucandanghehe <wallfjjd@gmail.com>
Date: Mon, 9 Aug 2021 08:16:11 +0800
Subject: [PATCH] =?UTF-8?q?C=20M=20D=20=E5=AE=B3=20=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml      | 13 +++----------
 .github/workflows/getVersion.bat |  2 --
 2 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 .github/workflows/getVersion.bat

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3be0413b..982ead21 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,20 +10,13 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: GetCommitID
-      #这里找不到好办法用git获取CommitID，就直接截取了
-      #如果有好办法的话欢迎pr（
-      #之前尝试用的：
-      #for /F %%i in ('git rev-parse --short "${{ GITHUB.SHA }}"') do (set CommitID=%%i)
-      #失败原因：
-      #直接powershell运行报错，使用bat运行会获取不到${{ GITHUB.SHA }}
       run: |
-        $CommitID="${{ GITHUB.SHA }}".Substring(0,7) 
-        echo $CommitID > test.txt
-        echo "CommitID=$CommitID"
+        $CommitID=git rev-parse --short "${{ GITHUB.SHA }}"
         echo "CommitID=$CommitID" >> $env:GITHUB_ENV
     - name: GetVersion
       run: |
-        .\.github\workflows\getVersion.bat
+        $Version=python .github/workflows/getVersion.py
+        echo "Version=$Version" >> $env:GITHUB_ENV
     - name: Download love
       run: |
         curl -OL https://github.com/love2d/love/releases/download/11.3/love-11.3-win64.zip
diff --git a/.github/workflows/getVersion.bat b/.github/workflows/getVersion.bat
deleted file mode 100644
index 26ae5276..00000000
--- a/.github/workflows/getVersion.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-for /F %%i in ('python .github/workflows/getVersion.py') do (set Version=%%i)
-powershell -Command echo "Version=%Version%" >> $env:GITHUB_ENV
\ No newline at end of file