From 38e1f4b58dcd449046bd16a763620c2aaca934b7 Mon Sep 17 00:00:00 2001 From: likanug <14996214+bruceblink@users.noreply.github.com> Date: Wed, 10 Dec 2025 14:56:55 +0800 Subject: [PATCH] chore: Add GitHub Actions workflow to sync with upstream This workflow automatically syncs the repository with the upstream every day at 3 AM UTC and allows manual triggering. --- .github/workflows/sync-upstream.yml | 49 +++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/sync-upstream.yml diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml new file mode 100644 index 00000000..434a79cb --- /dev/null +++ b/.github/workflows/sync-upstream.yml @@ -0,0 +1,49 @@ +name: Sync Upstream + +on: + workflow_dispatch: # 手动触发 + schedule: + - cron: "0 11 * * *" # 每天(utc)凌晨3点自动同步(可自行设置) + +permissions: + contents: write + +jobs: + sync: + runs-on: ubuntu-latest + + steps: + - name: Checkout your repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 # 必须拉取完整历史 + token: ${{ secrets.GITHUB_TOKEN }} + + # 配置 Git 信息 + - name: Configure Git + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + + # 添加 upstream(如果不存在) + - name: Add upstream remote + run: | + git remote add upstream https://github.com/PKUFlyingPig/cs-self-learning || true + git fetch upstream + +# # 方法1:merge(推荐,最稳定) +# - name: Merge upstream into main +# run: | +# git checkout master +# git merge upstream/master --no-edit || true + + # 方法2:rebase(更干净的历史) + - name: Rebase onto upstream + run: | + git checkout master + git rebase upstream/master || true + + # 推送到你的仓库 + - name: Push changes + run: | + git push origin master