ci: fix main branch ref in concurrency expression (#2104)

* fix: fix main branch ref in concurrency expression * fix: fix comment and close expression
dhis2 · Oct 9, 2024 · 76f8b69 · 76f8b69 · dhis2-bot · Oct 9, 2024
1 parent e5a72c0
commit 76f8b69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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: