diff --git a/.github/workflows/rebaseTemplate.yml b/.github/workflows/rebaseTemplate.yml index 5ade691..2b69b2e 100644 --- a/.github/workflows/rebaseTemplate.yml +++ b/.github/workflows/rebaseTemplate.yml @@ -9,8 +9,8 @@ on: - cron: "28 0 * * 3" concurrency: - group: "PullAndFix" - cancel-in-progress: false + group: "PullAndFix" + cancel-in-progress: false jobs: PullAndFix: @@ -22,12 +22,18 @@ jobs: env: TZ: "Asia/Tokyo" run: echo "CURRENT_DATETIME=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_ENV + - name: Remote Add + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: git remote add template https://github.com/UniPro-tech/NextBlogComplateStarter.git + - name: HASH + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: echo "HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - name: Pull env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - git remote add template https://github.com/UniPro-tech/NextBlogComplateStarter.git - echo "HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV git branch template/master_${{ env.HASH }} git pull template master:template/master_${{ env.HASH }} PR: