From d75a2ad5f5eb854a2d6ed9d2bbab3a0195ce8ad6 Mon Sep 17 00:00:00 2001 From: Jaakko Heusala Date: Sun, 24 Aug 2025 17:36:55 +0300 Subject: [PATCH 1/2] Fixed author_association --- .github/workflows/pr.yml | 2 +- .github/workflows/task-or-bug.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f2b203f..5807a97 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -16,7 +16,7 @@ jobs: dispatch: # Require: internal actor, not a fork, and PR targets main (tweak branch if needed) if: ${{ !github.event.pull_request.head.repo.fork - && contains(fromJSON('["MEMBER","OWNER","COLLABORATOR"]'), github.actor_association) + && contains(fromJSON('["MEMBER","OWNER","COLLABORATOR"]'), github.event.pull_request.author_association) && github.event.pull_request.base.ref == 'main' }} runs-on: ubuntu-latest timeout-minutes: 5 diff --git a/.github/workflows/task-or-bug.yml b/.github/workflows/task-or-bug.yml index f41a24d..e3d678b 100644 --- a/.github/workflows/task-or-bug.yml +++ b/.github/workflows/task-or-bug.yml @@ -25,7 +25,7 @@ concurrency: jobs: dispatch: # Only members/maintainers/collaborators can trigger runs from a public repo - if: ${{ contains(fromJSON('["MEMBER","OWNER","COLLABORATOR"]'), github.actor_association) }} + if: ${{ contains(fromJSON('["MEMBER","OWNER","COLLABORATOR"]'), github.event.issue.author_association) }} runs-on: ubuntu-latest timeout-minutes: 5 From 7b1abc0d551d5a1b587c9f9128b86c2240ff6f50 Mon Sep 17 00:00:00 2001 From: Jaakko Heusala Date: Sun, 24 Aug 2025 17:41:37 +0300 Subject: [PATCH 2/2] Fixed test --- .github/workflows/pr.yml | 2 +- .github/workflows/task-or-bug.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 5807a97..96f7c4f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -16,7 +16,7 @@ jobs: dispatch: # Require: internal actor, not a fork, and PR targets main (tweak branch if needed) if: ${{ !github.event.pull_request.head.repo.fork - && contains(fromJSON('["MEMBER","OWNER","COLLABORATOR"]'), github.event.pull_request.author_association) + && contains(fromJSON('["thejhh","heusalagroupbot"]'), github.actor) && github.event.pull_request.base.ref == 'main' }} runs-on: ubuntu-latest timeout-minutes: 5 diff --git a/.github/workflows/task-or-bug.yml b/.github/workflows/task-or-bug.yml index e3d678b..6acd6c1 100644 --- a/.github/workflows/task-or-bug.yml +++ b/.github/workflows/task-or-bug.yml @@ -25,7 +25,7 @@ concurrency: jobs: dispatch: # Only members/maintainers/collaborators can trigger runs from a public repo - if: ${{ contains(fromJSON('["MEMBER","OWNER","COLLABORATOR"]'), github.event.issue.author_association) }} + if: ${{ contains(fromJSON('["thejhh","heusalagroupbot"]'), github.actor) }} runs-on: ubuntu-latest timeout-minutes: 5