diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index 0fecde80bf31b..6583424c02e05 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -27,18 +27,18 @@ jobs: run: pnpm install --frozen-lockfile - name: Lint - if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' run: pnpm run pretty:check - name: Build 🛠 - if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' run: pnpm run build - name: Run tests 🩺 run: pnpm run test - name: Add build.txt 🗓 - if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' run: | git log --pretty=format:'%h' -n 1 > dist/build.txt echo >> dist/build.txt @@ -52,15 +52,3 @@ jobs: folder: dist # The folder the action should deploy. single-commit: true clean: true -# clean-exclude: | -# develop - -# - name: Deploy to /develop 🚀 -# if: github.ref == 'refs/heads/develop' -# uses: JamesIves/github-pages-deploy-action@v4.6.3 -# with: -# branch: gh-pages -# folder: dist -# target-folder: develop -# single-commit: true -# clean: true diff --git a/.github/workflows/merge_master_to_dev.yml b/.github/workflows/merge_master_to_dev.yml index b841bf1d16f11..fce98fb2b8029 100644 --- a/.github/workflows/merge_master_to_dev.yml +++ b/.github/workflows/merge_master_to_dev.yml @@ -1,4 +1,4 @@ -name: Merge master to develop +name: Merge master to dev on: push: @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Merge master -> develop + - name: Merge master -> dev uses: devmasx/merge-branch@master with: type: now head_to_merge: master - target_branch: develop + target_branch: dev github_token: ${{ github.token }}