From 2a71cbd418b6db2fbcc463f57f10bfeb3cdc31f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=99=E6=BC=A0=E4=B9=8B=E5=AD=90?= <7850715+maboloshi@users.noreply.github.com> Date: Sat, 28 Sep 2024 20:08:32 +0800 Subject: [PATCH] =?UTF-8?q?GA=EF=BC=9A=E4=BF=AE=E6=AD=A3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E4=BA=A4=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/locals(greasyfork).js_update.yaml | 2 +- .github/workflows/main.user.js_version_update.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/locals(greasyfork).js_update.yaml b/.github/workflows/locals(greasyfork).js_update.yaml index 6951f1e95..c821427aa 100644 --- a/.github/workflows/locals(greasyfork).js_update.yaml +++ b/.github/workflows/locals(greasyfork).js_update.yaml @@ -25,7 +25,7 @@ jobs: - name: Sync update locals(greasyfork).js run: | # 获得最近以`main.user.js Update to version`开头的提交的引用 - ref=$(git log --grep="^main.user.js Update to version" -n 1 --pretty=format:"%H") + ref=$(git log --grep="^main.user.js Update to" -n 1 --pretty=format:"%H") # 获取该提交中`locals.js`的文件时间, 并设置环境变量 locals_js_time=$(git log -1 --format=%at $ref -- locals.js) diff --git a/.github/workflows/main.user.js_version_update.yaml b/.github/workflows/main.user.js_version_update.yaml index aeb010641..4f932e131 100644 --- a/.github/workflows/main.user.js_version_update.yaml +++ b/.github/workflows/main.user.js_version_update.yaml @@ -26,8 +26,8 @@ jobs: run: | # 最近提交是否存在tag if [ ! "$(git tag --contains ${{ github.sha }})" ]; then - # 获得最近以`main.user.js Update to version`开头的提交的sha和时间戳 - release_commit_sha=$(git log --grep="^main.user.js Update to version" -n 1 --pretty=format:"%H") + # 获得最近以`main.user.js Update to`开头的提交的sha和时间戳 + release_commit_sha=$(git log --grep="^main.user.js Update to" -n 1 --pretty=format:"%H") release_commit_timestamp=$(git show -s --format=%ct $release_commit_sha) # 最近的tag对应提交的sha和时间戳