From b5978af138932d5515d821bd427170cafa919787 Mon Sep 17 00:00:00 2001 From: Elio Di Nino <52972357+ElioDiNino@users.noreply.github.com> Date: Fri, 31 May 2024 09:35:20 -0400 Subject: [PATCH 1/2] chore(dependency-auto-merge): adjust triggers to reflect ruleset Since this workflow is now required as part of an org-wide ruleset, we no longer need synced workflow files and can remove the workflow_call trigger. --- .github/workflows/dependency-auto-merge.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dependency-auto-merge.yml b/.github/workflows/dependency-auto-merge.yml index f77d1bf..140c78a 100644 --- a/.github/workflows/dependency-auto-merge.yml +++ b/.github/workflows/dependency-auto-merge.yml @@ -1,7 +1,9 @@ +# This workflow is required and run as part of an org-wide ruleset + name: Dependency Auto-Merge on: - workflow_call: pull_request: + merge_group: jobs: dependabot: From 116cdbe3a5c613a2759608d920b39becc8c99245 Mon Sep 17 00:00:00 2001 From: Elio Di Nino <52972357+ElioDiNino@users.noreply.github.com> Date: Fri, 31 May 2024 09:47:21 -0400 Subject: [PATCH 2/2] fix: add missing permissions to workflow --- .github/workflows/dependency-auto-merge.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/dependency-auto-merge.yml b/.github/workflows/dependency-auto-merge.yml index 140c78a..03f9c51 100644 --- a/.github/workflows/dependency-auto-merge.yml +++ b/.github/workflows/dependency-auto-merge.yml @@ -5,6 +5,11 @@ on: pull_request: merge_group: +permissions: + pull-requests: write + contents: write + issues: write + jobs: dependabot: name: Auto-Merge Dependabot PR