From d9930dada62fc5c78f4a4fdb287bb7b15f9d63bb Mon Sep 17 00:00:00 2001 From: zhuyuan-bot Date: Mon, 13 Apr 2026 09:04:13 +0000 Subject: [PATCH] Revert "Create sync-upstream.yml" This reverts commit fba39cc6b17de8d41a4fdd89b12a07bfee09cbd0. --- .github/workflows/sync-upstream.yml | 34 ----------------------------- 1 file changed, 34 deletions(-) delete mode 100644 .github/workflows/sync-upstream.yml diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml deleted file mode 100644 index 950a801d..00000000 --- a/.github/workflows/sync-upstream.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: 🔄 同步冰朔上游仓库 - -on: - schedule: - - cron: '0 2 * * *' - workflow_dispatch: - -jobs: - sync: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - token: $ secrets.GITHUB_TOKEN - - - name: 配置 Git - run: | - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - - - name: 添加上游仓库(冰朔) - run: | - git remote add upstream https://github.com/qinfendebingshuo/guanghulab.git || true - git fetch upstream - - - name: 合并上游更新到主分支 - run: | - git checkout main - git merge upstream/main --no-edit --allow-unrelated-histories - - - name: 推送到你的仓库 - run: git push origin main