diff --git a/.github/workflows/java-checkstyle.yml b/.github/workflows/java-checkstyle.yml index 92311cd..d6f5dad 100644 --- a/.github/workflows/java-checkstyle.yml +++ b/.github/workflows/java-checkstyle.yml @@ -5,12 +5,7 @@ on: workflow_call: concurrency: - group: | - # For pull requests, group by the pull request ID - ${{ github.event_name == 'pull_request' && format('pr-{0}-java-checkstyle', github.event.pull_request.number) }} - - # For pushes to main, group by the branch name (e.g., 'main') - ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && 'main-branch-java-checkstyle' }} + group: ${{ github.event_name == 'pull_request' && format('pr-{0}-java-checkstyle', github.event.pull_request.number) || (github.event_name == 'push' && github.ref == 'refs/heads/main' && 'main-branch-java-checkstyle') || 'java-checkstyle' }} cancel-in-progress: true jobs: lint: diff --git a/.github/workflows/mvn-package.yml b/.github/workflows/mvn-package.yml index b563b88..b2eb4f4 100644 --- a/.github/workflows/mvn-package.yml +++ b/.github/workflows/mvn-package.yml @@ -26,12 +26,7 @@ on: required: false concurrency: - group: | - # For pull requests, group by the pull request ID - ${{ github.event_name == 'pull_request' && format('pr-{0}-mvn-package', github.event.pull_request.number) }} - - # For pushes to main, group by the branch name (e.g., 'main') - ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && 'main-branch-mvn-package' }} + group: ${{ github.event_name == 'pull_request' && format('pr-{0}-mvn-package', github.event.pull_request.number) || (github.event_name == 'push' && github.ref == 'refs/heads/main' && 'main-branch-mvn-package') || 'mvn-package' }} cancel-in-progress: true jobs: