From d73964a88035ece9f9ffe34a87b756482ac11b0a Mon Sep 17 00:00:00 2001
From: ismay <7355199+ismay@users.noreply.github.com>
Date: Wed, 9 Oct 2024 14:04:38 +0200
Subject: [PATCH] ci: fix main branch ref in concurrency expression (#561)

* fix: fix main branch ref in concurrency expression

* fix: fix comment and close expression
---
 .github/workflows/comment-and-close.yml | 2 +-
 .github/workflows/test-and-release.yml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 }}
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: