From 608ea501a4c84c5e3ebc8c3a8d42870f93afbbcb Mon Sep 17 00:00:00 2001 From: NianBroken Date: Tue, 13 Feb 2024 14:21:33 +0800 Subject: [PATCH] Update image --- .github/workflows/main.yml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f5de15a..863e2d1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,30 +47,33 @@ jobs: git remote add upstream https://github.com/NianBroken/ZFCheckScores.git git fetch upstream main - # 创建一个备份目录,并将当前目录及子目录中的所有.txt文件复制到备份目录,并保持路径 - - name: Backup local .txt files + # 定义文件后缀列表 + - name: Define file extensions + run: | + # 可以根据需要添加其他文件后缀,以空格分隔 + FILE_EXTENSIONS=".txt .yml" + + # 创建一个备份目录,并将当前目录及子目录中的所有指定后缀文件复制到备份目录,并保持路径 + - name: Backup local files with specified extensions run: | mkdir -p backup - find . -type f -name "*.txt" -exec cp --parents {} backup/ \; || echo "No .txt files to backup" + for EXT in $FILE_EXTENSIONS; do + find . -type f -name "*$EXT" -exec cp --parents {} backup/ \; || echo "No $EXT files to backup" + done # 将上游main分支的更改强制推送到当前main分支 - name: Force push changes from upstream to current main branch run: | git checkout main git reset --hard upstream/main - git push origin main --force || (for i in {1..10}; do - echo "------" && - echo "你需要手动同步上游分支" && - echo "同步方法如下:" && - echo "1. 打开你的仓库首页:https://github.com/${{ github.repository }}" && - echo "2. 点击 Sync fork"&& - echo "3. 点击 Update branch 或 Discard xxx commits"; - done; exit 1) + git push origin main --force - # 从备份目录将.txt文件还原到当前目录及子目录中,然后删除备份目录 - - name: Restore local .txt files and delete backup + # 从备份目录将指定后缀文件还原到当前目录及子目录中,然后删除备份目录 + - name: Restore local files with specified extensions and delete backup run: | - find backup -type f -name "*.txt" -exec cp --parents {} . \; || echo "No .txt files to restore" + for EXT in $FILE_EXTENSIONS; do + find backup -type f -name "*$EXT" -exec cp --parents {} . \; || echo "No $EXT files to restore" + done rm -rf backup # 运行主程序main.py