From 855b7659dd51bac3d4df087c9ba6108380863bf5 Mon Sep 17 00:00:00 2001 From: Seungwoo321 Date: Mon, 12 May 2025 15:47:24 +0900 Subject: [PATCH] fix: update workflows --- .github/workflows/sync-vue-pivottable.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/sync-vue-pivottable.yml b/.github/workflows/sync-vue-pivottable.yml index 9c0bc35..052de82 100644 --- a/.github/workflows/sync-vue-pivottable.yml +++ b/.github/workflows/sync-vue-pivottable.yml @@ -30,19 +30,14 @@ jobs: git config --global user.name "GitHub App" git config --global user.email "github-app@example.com" - git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git - git fetch origin - if git show-ref --quiet refs/remotes/origin/release; then - git checkout release + if git ls-remote --exit-code --heads origin release; then + git fetch origin release + git checkout -b release origin/release git merge --no-edit origin/main else git checkout -b release origin/main fi - if git diff --quiet origin/release; then - echo "No changes to push." - else - git push origin release - fi + git push "https://x-access-token:${GITHUB_TOKEN}@github.com/vue-pivottable/vue3-pivottable.git" release