From dbe772fe36d7fffbe4c6ca75a3862336092c3e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A2=E3=83=AC=E3=82=AF=E3=82=B5=E3=83=B3=E3=83=80?= =?UTF-8?q?=E3=83=BC=2Eeth?= Date: Wed, 9 Oct 2024 05:43:44 +0900 Subject: [PATCH] fix: sync template --- .github/workflows/sync-template.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/sync-template.yml b/.github/workflows/sync-template.yml index bee73596..a7868ed7 100644 --- a/.github/workflows/sync-template.yml +++ b/.github/workflows/sync-template.yml @@ -27,13 +27,12 @@ jobs: - name: Sync branch to template env: GH_TOKEN: ${{ steps.get_installation_token.outputs.token }} - IGNORE_FILES: "README.md another-file.txt" run: | branch_name=$(git rev-parse --abbrev-ref HEAD) original_remote=$(git remote get-url origin) pr_branch="sync-template/${branch_name}" - git config --global user.email "github-actions[bot]@users.noreply.github.com" - git config --global user.name "github-actions[bot]" + git config --global user.email "ubiquity-os[bot]@users.noreply.github.com" + git config --global user.name "ubiquity-os[bot]" git remote add template https://github.com/ubiquity/ts-template.git git fetch template @@ -54,11 +53,6 @@ jobs: git merge template/main --allow-unrelated-histories --no-commit fi - # Remove ignored files - for file in $IGNORE_FILES; do - git rm -rf "$file" || true - done - # Check if there are any changes if git diff --staged --quiet && git diff --quiet; then echo "No changes to sync from template."