From c1ce09ac52e069d87ccccfaa5a9720651a0b74c9 Mon Sep 17 00:00:00 2001
From: scdhh <51957264+shoucandanghehe@users.noreply.github.com>
Date: Tue, 10 Aug 2021 03:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E8=87=AA=E5=8A=A8=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E6=B7=BB=E5=8A=A0=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?hash=20#176=20(#184)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 删除不需要的re模块

* 添加编译过程中向源码添加提交hash的步骤

* 修正变量

* 整理代码
---
 .github/workflows/build.yml            | 31 +++++++++++++++++---------
 .github/workflows/updateConfVersion.py | 13 +++++++++++
 .github/workflows/updateOSXVersion.py  |  2 +-
 3 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/updateConfVersion.py

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a93dc413..8d5aa089 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,14 +9,17 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
-    - name: GetCommitID
+    - name: Get CommitID
       run: |
         $CommitID=git rev-parse --short "${{ GITHUB.SHA }}"
         echo "CommitID=${CommitID}" >> $env:GITHUB_ENV
-    - name: GetVersion
+    - name: Get Version
       run: |
         $Version=python .github/workflows/getVersion.py
         echo "Version=${Version}" >> $env:GITHUB_ENV
+    - name: Update Conf Version
+      run: |
+        python .github/workflows/updateConfVersion.py -H ${{ env.CommitID }}
     - name: Download love
       run: |
         curl -OL https://github.com/love2d/love/releases/download/11.3/love-11.3-win64.zip
@@ -44,14 +47,17 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
-    - name: GetCommitID
+    - name: Get CommitID
       run: |
         CommitID=$(git rev-parse --short "${{ GITHUB.SHA }}")
         echo "CommitID=${CommitID}" >> $GITHUB_ENV
-    - name: GetVersion
+    - name: Get Version
       run: |
         Version=$(python3 .github/workflows/getVersion.py)
         echo "Version=${Version}" >> $GITHUB_ENV
+    - name: Update Conf Version
+      run: |
+        python3 .github/workflows/updateConfVersion.py -H ${{ env.CommitID }}
     - name: Download AppImageKit
       run: curl -OL https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage
     - name: Unpack and Repack
@@ -75,14 +81,17 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
-    - name: GetCommitID
+    - name: Get CommitID
       run: |
         CommitID=$(git rev-parse --short "${{ GITHUB.SHA }}")
         echo "CommitID=${CommitID}" >> $GITHUB_ENV
-    - name: GetVersion
+    - name: Get Version
       run: |
         Version=$(python3 .github/workflows/getVersion.py)
         echo "Version=${Version}" >> $GITHUB_ENV
+    - name: Update Conf Version
+      run: |
+        python3 .github/workflows/updateConfVersion.py -H ${{ env.CommitID }}
     - name: Download Apktool
       run: curl -OL https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_2.5.0.jar
     - name: Unpack and Repack
@@ -95,8 +104,7 @@ jobs:
         python3 .github/workflows/updateAndroidVersion.py
         java -jar apktool_2.5.0.jar b -o Techmino.apk apk
     - uses: 26F-Studio/sign-android-release@master
-      name: Sign app APK
-      id: sign_app
+      name: Sign APK
       with:
         releaseDirectory: .
         signingKeyBase64: ${{ secrets.SIGNING_KEY }}
@@ -115,14 +123,17 @@ jobs:
     runs-on: macos-10.15
     steps:
     - uses: actions/checkout@v2
-    - name: GetCommitID
+    - name: Get CommitID
       run: |
         CommitID=$(git rev-parse --short "${{ GITHUB.SHA }}")
         echo "CommitID=${CommitID}" >> $GITHUB_ENV
-    - name: GetVersion
+    - name: Get Version
       run: |
         Version=$(python3 .github/workflows/getVersion.py)
         echo "Version=${Version}" >> $GITHUB_ENV
+    - name: Update Conf Version
+      run: |
+        python3 .github/workflows/updateConfVersion.py -H ${{ env.CommitID }}
     - name: Pack love
       run: |
         zip -r Techmino.love document media parts Zframework conf.lua font.ttf main.lua
diff --git a/.github/workflows/updateConfVersion.py b/.github/workflows/updateConfVersion.py
new file mode 100644
index 00000000..3537a019
--- /dev/null
+++ b/.github/workflows/updateConfVersion.py
@@ -0,0 +1,13 @@
+import argparse
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description="用于更新conf.lua内编译版本号")
+    parser.add_argument("-H", "--Hash", type=str, help = "Github提交Hash")
+    args = parser.parse_args()
+    with open("conf.lua", "r+", encoding="utf-8") as file:
+        data = file.read()
+        data = data.replace('@DEV', f'@{args.Hash[0:4]}')
+        file.seek(0)
+        file.truncate()
+        file.flush()
+        file.write(data)
\ No newline at end of file
diff --git a/.github/workflows/updateOSXVersion.py b/.github/workflows/updateOSXVersion.py
index 667b7751..a4b109c6 100644
--- a/.github/workflows/updateOSXVersion.py
+++ b/.github/workflows/updateOSXVersion.py
@@ -1,4 +1,4 @@
-import re, datetime
+import datetime
 import getVersion
 info = r"""<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">