diff --git a/.github/workflows/sync_repo.yml b/.github/workflows/sync_repo.yml index 17585885..e40a2a1a 100644 --- a/.github/workflows/sync_repo.yml +++ b/.github/workflows/sync_repo.yml @@ -8,6 +8,8 @@ on: jobs: sync: + # Upstream's Gitee mirror job. Only runs in OpenListTeam's repo. + if: github.repository == 'OpenListTeam/OpenList-Worker' runs-on: ubuntu-latest name: Sync Repository steps: diff --git a/.github/workflows/upstream-sync.yml b/.github/workflows/upstream-sync.yml index 381c2423..fe67006e 100644 --- a/.github/workflows/upstream-sync.yml +++ b/.github/workflows/upstream-sync.yml @@ -45,6 +45,8 @@ jobs: for f in wrangler.jsonc README.md; do if git diff --name-only --diff-filter=U | grep -qx "$f"; then git checkout --ours -- "$f"; git add "$f"; fi done + # Translated READMEs are deleted here; keep them deleted when upstream edits them. + git diff --name-only --diff-filter=U | grep -E '^readmes/[^/]+\.md$' | xargs -r git rm -q -- left=$(git diff --name-only --diff-filter=U) if [ -n "$left" ]; then git merge --abort