diff --git a/.github/workflows/deploy-pr.yml b/.github/workflows/deploy-pr.yml index 56e425a3..fc915d19 100644 --- a/.github/workflows/deploy-pr.yml +++ b/.github/workflows/deploy-pr.yml @@ -4,7 +4,7 @@ on: pull_request: concurrency: - group: ${{ github.workflow}}-${{ github.head_ref }} + group: ${{ github.workflow }}-${{ github.head_ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml index aacbb1a0..9575c2ed 100644 --- a/.github/workflows/deploy-production.yml +++ b/.github/workflows/deploy-production.yml @@ -6,7 +6,7 @@ on: - master concurrency: - group: ${{ github.workflow}}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/lint-pr-title.yml b/.github/workflows/lint-pr-title.yml index 2e99c77c..eb59072b 100644 --- a/.github/workflows/lint-pr-title.yml +++ b/.github/workflows/lint-pr-title.yml @@ -5,7 +5,7 @@ on: types: ['opened', 'edited', 'reopened', 'synchronize'] concurrency: - group: ${{ github.workflow}}-${{ github.head_ref }} + group: ${{ github.workflow }}-${{ github.head_ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index 7e6ebdc8..d3330dcd 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -3,7 +3,7 @@ name: test-and-release on: push concurrency: - group: ${{ github.workflow}}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} # Cancel previous runs if not on a release branch cancel-in-progress: ${{ !contains(github.ref, fromJSON('["master", "main"]')) }} @@ -20,7 +20,7 @@ jobs: if: '!github.event.push.repository.fork' secrets: inherit release: - needs: [lint, test, e2e] + needs: [lint-commits, lint, test, e2e] uses: dhis2/workflows-platform/.github/workflows/release.yml@v1 # Skips forks and dependabot PRs if: '!github.event.push.repository.fork'