diff --git a/.github/workflows/comment-and-close.yml b/.github/workflows/comment-and-close.yml index 6edcddd0..a8ddd038 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 }} diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index 40396771..f5f4c697 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: