From 395040ac944e6e7a6d850dbfa0c5174cb084240f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A2=8E=E5=BF=B5=5FNian?= <suinian666@gmail.com>
Date: Sun, 28 Jul 2024 20:24:24 +0800
Subject: [PATCH] Optimize some code

---
 .github/workflows/main.yml | 14 ++++++++++----
 main.py                    |  8 +++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0886e25..7f7bbc1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -66,7 +66,10 @@ jobs:
           USERNAME: ${{ secrets.USERNAME }}
           PASSWORD: ${{ secrets.PASSWORD }}
           TOKEN: ${{ secrets.TOKEN }}
+          GITHUB_REF_NAME: ${{ github.ref_name }}
           GITHUB_EVENT_NAME: ${{ github.event_name }}
+          GITHUB_ACTOR: ${{ github.actor }}
+          GITHUB_ACTOR_ID: ${{ github.actor_id }}
           GITHUB_TRIGGERING_ACTOR: ${{ github.triggering_actor }}
           REPOSITORY_NAME: ${{ github.repository }}
           GITHUB_SHA: ${{ github.sha }}
@@ -154,8 +157,11 @@ jobs:
           echo "Username: $(mask_middle "$USERNAME")"  # 调用 mask_middle 函数处理字符串并输出结果
           echo "Password: $(mask_middle "$PASSWORD")"  # 调用 mask_middle 函数处理字符串并输出结果
           echo "Force Push Message: $FORCE_PUSH_MESSAGE"
+          echo "Branch Name: $GITHUB_REF_NAME"
           echo "Triggered By: $GITHUB_EVENT_NAME"
-          echo "Run By: $GITHUB_TRIGGERING_ACTOR"
+          echo "Initial Run By: $GITHUB_ACTOR"
+          echo "Initial Run By ID: $GITHUB_ACTOR_ID"
+          echo "Initiated Run By: $GITHUB_TRIGGERING_ACTOR"
           echo "Repository Name: $REPOSITORY_NAME"
           echo "Commit SHA: $GITHUB_SHA"
           echo "Workflow Name: $GITHUB_WORKFLOW"
@@ -172,9 +178,9 @@ jobs:
           rm -rf __pycache__
           rm -rf scripts/__pycache__
 
-      - name: Force push changes to main branch
+      - name: Force push changes to the running branch
         run: |
-          # 将更改强制推送到main分支
+          # 将更改强制推送到运行分支
           git add .
           git commit -m "Update from GitHub Actions" || true
-          git push origin main --force
+          git push origin $GITHUB_REF_NAME --force
diff --git a/main.py b/main.py
index d500c17..b688bcc 100644
--- a/main.py
+++ b/main.py
@@ -23,7 +23,10 @@ url = os.environ.get("URL")
 username = os.environ.get("USERNAME")
 password = os.environ.get("PASSWORD")
 token = os.environ.get("TOKEN")
+github_ref_name = os.environ.get("GITHUB_REF_NAME")
 github_event_name = os.environ.get("GITHUB_EVENT_NAME")
+github_actor = os.environ.get("GITHUB_ACTOR")
+github_actor_id = os.environ.get("GITHUB_ACTOR_ID")
 github_triggering_actor = os.environ.get("GITHUB_TRIGGERING_ACTOR")
 repository_name = os.environ.get("REPOSITORY_NAME")
 github_sha = os.environ.get("GITHUB_SHA")
@@ -140,8 +143,11 @@ workflow_info = (
     f"------\n"
     f"工作流信息：\n"
     f"Force Push Message：{force_push_message}\n"
+    f"Github Ref Name：{github_ref_name}\n"
     f"Triggered By：{github_event_name}\n"
-    f"Run By：{github_triggering_actor}\n"
+    f"Initial Run By：{github_actor}\n"
+    f"Initial Run By ID：{github_actor_id}\n"
+    f"Initiated Run By：{github_triggering_actor}\n"
     f"Repository Name：{repository_name}\n"
     f"Commit SHA：{github_sha}\n"
     f"Workflow Name：{github_workflow}\n"