From 734350ea6238f7ac3e9c24e559395617dc3c45e3 Mon Sep 17 00:00:00 2001 From: ismay Date: Tue, 8 Oct 2024 11:25:04 +0200 Subject: [PATCH 1/2] fix: fix main branch ref in concurrency expression --- .github/workflows/test-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index 9e05061..f9b8cf8 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -5,7 +5,7 @@ on: push concurrency: group: ${{ github.workflow }}-${{ github.ref }} # Cancel previous runs if not on a release branch - cancel-in-progress: ${{ !contains(fromJSON('["refs/heads/master", "ref/heads/main"]'), github.ref) }} + cancel-in-progress: ${{ !contains(fromJSON('["refs/heads/master", "refs/heads/main"]'), github.ref) }} jobs: lint-commits: From fd66d0c977bc928a50a85c90eda9d777d991bcf0 Mon Sep 17 00:00:00 2001 From: ismay Date: Tue, 8 Oct 2024 12:37:03 +0200 Subject: [PATCH 2/2] fix: fix comment and close expression --- .github/workflows/comment-and-close.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/comment-and-close.yml b/.github/workflows/comment-and-close.yml index 6edcddd..a8ddd03 100644 --- a/.github/workflows/comment-and-close.yml +++ b/.github/workflows/comment-and-close.yml @@ -7,6 +7,6 @@ on: jobs: comment-and-close: uses: dhis2/workflows-platform/.github/workflows/comment-and-close.yml@v1 - if: '!contains(github.event.issue.sender.login , fromJson(''["dhis2-bot", "kodiakhq", "dependabot"]''))' + if: '!contains(fromJson(''["dhis2-bot", "kodiakhq", "dependabot"]''), github.event.issue.sender.login)' with: issue_number: ${{ github.event.issue.number }}