diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow-pull_request.yml similarity index 79% rename from .github/workflows/workflow.yml rename to .github/workflows/workflow-pull_request.yml index e01d208e7..1360ca96e 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow-pull_request.yml @@ -1,8 +1,6 @@ -name: 'Continuous Integration for IBF' +name: 'Run checks on pull request' on: - push: - branches: [master] pull_request: branches: [master] @@ -111,28 +109,3 @@ jobs: uses: ./.github/actions/e2e with: mailchimp-api-key: ${{ secrets.MC_API }} - - bump-version: - needs: [ibf-api-service, ibf-dashboard, ibf-integration, ibf-e2e] - if: | - github.event_name == 'push' && - success() - - runs-on: ubuntu-latest - - steps: - - name: Wait for previous workflow to complete - uses: softprops/turnstyle@v2 - with: - abort-after-seconds: 1800 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - uses: actions/checkout@v4 - - - name: Bump version and push tag - uses: TriPSs/conventional-changelog-action@v6 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - git-message: 'chore(release): {version}' - release-count: 10 diff --git a/.github/workflows/workflow-push.yml b/.github/workflows/workflow-push.yml new file mode 100644 index 000000000..d2bf1bde8 --- /dev/null +++ b/.github/workflows/workflow-push.yml @@ -0,0 +1,26 @@ +name: 'Bump version and push tag on merge to master' + +on: + push: + branches: [master] + +jobs: + bump-version: + runs-on: ubuntu-latest + + steps: + - name: Wait for previous workflow to complete + uses: softprops/turnstyle@v2 + with: + abort-after-seconds: 1800 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - uses: actions/checkout@v4 + + - name: Bump version and push tag + uses: TriPSs/conventional-changelog-action@v6 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + git-message: 'chore(release): {version}' + release-count: 10