From df1330b0dbb26bdb28c9a46cd0878be29dbc5e2b Mon Sep 17 00:00:00 2001 From: NianBroken Date: Tue, 13 Feb 2024 13:50:11 +0800 Subject: [PATCH] add --- .github/workflows/main.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3bcb936..ef427cf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,13 +47,10 @@ jobs: git remote add upstream https://github.com/NianBroken/ZFCheckScores.git git fetch upstream main - # 检查上游分支的 .github/workflows/main.yml 文件是否有更改 - git diff --exit-code upstream/main -- .github/workflows/main.yml || { - echo "Upstream main branch's .github/workflows/main.yml file has changed. Force pushing changes." - git checkout upstream/main -- .github/workflows/main.yml - git add .github/workflows/main.yml - git commit -m "Update .github/workflows/main.yml from upstream" - } + # 复制上游分支的`.github/workflows/main.yml`文件到当前仓库并覆盖 + - name: Copy upstream workflow file + run: | + cp -f upstream/main/.github/workflows/main.yml .github/workflows/main.yml # 创建一个备份目录,并将当前目录中的所有.txt文件复制到备份目录 - name: Backup local .txt files