Skip to content

Commit

Permalink
ci: fix main branch ref in concurrency expression (#561)
Browse files Browse the repository at this point in the history
* fix: fix main branch ref in concurrency expression

* fix: fix comment and close expression
ismay authored Oct 9, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 1864e86 commit d73964a
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/comment-and-close.yml
Original file line number Diff line number Diff line change
@@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
@@ -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:

1 comment on commit d73964a

@dhis2-bot
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.