diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge.yml similarity index 90% rename from .github/workflows/merge-main.yml rename to .github/workflows/merge.yml index f66d25c..ac2f59f 100644 --- a/.github/workflows/merge-main.yml +++ b/.github/workflows/merge.yml @@ -1,7 +1,15 @@ -name: semantic release +name: Merge on: + push: + branches: [main] + paths-ignore: + - '*.md' + - '.github/**' + - 'charts/**' + - '!.github/workflows/merge.yml' workflow_dispatch: + concurrency: group: ${{ github.workflow }} cancel-in-progress: true @@ -10,8 +18,7 @@ jobs: semantic-release: runs-on: ubuntu-22.04 steps: - - name: Checkout - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Conventional Changelog Update diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml index d866022..2e6eb29 100644 --- a/.github/workflows/pr-close.yml +++ b/.github/workflows/pr-close.yml @@ -1,12 +1,11 @@ -name: Pull Request Closed +name: PR Closed on: pull_request: - branches: - - main - types: - - closed + types: [closed] paths-ignore: + - '*.md' + - '.github/**' - 'charts/**' concurrency: diff --git a/.github/workflows/on-pr-main.yml b/.github/workflows/pr-open.yml similarity index 93% rename from .github/workflows/on-pr-main.yml rename to .github/workflows/pr-open.yml index 3825026..7283148 100644 --- a/.github/workflows/on-pr-main.yml +++ b/.github/workflows/pr-open.yml @@ -1,15 +1,12 @@ -name: Build and Deploy of Job on Pull Request to Main +name: PR on: pull_request: - branches: - - main - paths-ignore: - - 'charts/**' + merge_group: concurrency: - # PR open and close use the same group, allowing only one at a time - group: pr-${{ github.workflow }}-${{ github.event.number }} + # Cancel in progress for PR open and close, but not merge_group + group: ${{ github.workflow }}-${{ github.event.number || github.event.merge_group.base_sha }} cancel-in-progress: true jobs: @@ -43,6 +40,7 @@ jobs: build_file: ${{ matrix.build_file }} build_context: ${{ matrix.build_context }} triggers: ${{ matrix.triggers }} + - uses: shrink/actions-docker-registry-tag@v3 with: registry: ghcr.io