diff --git a/.github/workflows/push-and-pr.workflow.yaml b/.github/workflows/push-and-pr.workflow.yaml index 3cf874b..0e0d47b 100644 --- a/.github/workflows/push-and-pr.workflow.yaml +++ b/.github/workflows/push-and-pr.workflow.yaml @@ -6,7 +6,6 @@ on: - master - beta - '[0-9]+-dev' - - eslint-9 pull_request: jobs: @@ -46,7 +45,7 @@ jobs: release: name: Release process - if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/beta' || github.ref == 'refs/heads/eslint-9') }} + if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/beta') || github.ref == 'refs/heads/eslint-9' }} needs: [lint, functional-tests] runs-on: ubuntu-latest permissions: @@ -73,9 +72,9 @@ jobs: SEMANTIC_RELEASE_SLACK_WEBHOOK: ${{ secrets.SEMANTIC_RELEASE_SLACK_WEBHOOK }} run: npx semantic-release - - name: Rebase dev branch (keep linear history) - if: ${{ github.ref != 'refs/heads/1-dev' }} - run: | - git fetch --no-tags origin 1-dev:1-dev - git rebase ${GITHUB_REF_NAME} 1-dev - git push origin 1-dev + # - name: Rebase dev branch (keep linear history) + # if: ${{ github.ref != 'refs/heads/1-dev' }} + # run: | + # git fetch --no-tags origin 1-dev:1-dev + # git rebase ${GITHUB_REF_NAME} 1-dev + # git push origin 1-dev diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..83b6947 --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +CHANGELOG.md \ No newline at end of file