From 89d4c90ba95a996c6ec5fd756bdc1e945c14635a Mon Sep 17 00:00:00 2001 From: YuitoAkatsuki Date: Thu, 11 Apr 2024 15:46:19 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20rebase=E3=82=B3=E3=83=9E=E3=83=B3?= =?UTF-8?q?=E3=83=89=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 18a7ae1..726877c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: - name: Rebase env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: git rebase ${{ github.event.pull_request.base.ref }} + run: git rebase origin ${{ github.event.pull_request.base.ref }} - name: Update Version if: ${{ env.NPM_VERSION >= env.NPM_NEW_VERSION }} @@ -73,7 +73,7 @@ jobs: - name: Rebase env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: git rebase ${{ github.event.pull_request.base.ref }} + run: git rebase origin ${{ github.event.pull_request.base.ref }} - name: Update Version if: ${{ env.NPM_VERSION >= env.NPM_NEW_VERSION }} @@ -115,7 +115,7 @@ jobs: - name: Rebase env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: git rebase ${{ github.event.pull_request.base.ref }} + run: git rebase origin ${{ github.event.pull_request.base.ref }} - name: Update Version if: ${{ env.NPM_VERSION >= env.NPM_NEW_VERSION }}