diff --git a/.github/workflows/gh-publish.yml b/.github/workflows/gh-pages.yml similarity index 58% rename from .github/workflows/gh-publish.yml rename to .github/workflows/gh-pages.yml index 97d2397d4f..5dafdbcd41 100644 --- a/.github/workflows/gh-publish.yml +++ b/.github/workflows/gh-pages.yml @@ -9,14 +9,30 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + ref: gh-deploy + - uses: actions/setup-node@v4 with: node-version: 18 registry-url: https://registry.npmjs.org - - run: yarn install + cache: 'yarn' + + - name: Merge + uses: devmasx/merge-branch@master + with: + type: now + from_branch: main + target_branch: gh-deploy + github_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Install + run: yarn install + - name: Build working-directory: '.' run: yarn build:pages + - name: Deploy uses: JamesIves/github-pages-deploy-action@v4 with: