From 5730355345473b4b0aa93d71da76de5d5624d59a Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Wed, 28 Jun 2023 20:41:51 +0100 Subject: [PATCH 1/2] fix(NA): checking pr author through github.base_ref instead of pull_request event on auto backport approve ghaction --- .github/workflows/auto-approve-backports.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/auto-approve-backports.yml b/.github/workflows/auto-approve-backports.yml index 65e5e2436ab71..7b07b5bf45b84 100644 --- a/.github/workflows/auto-approve-backports.yml +++ b/.github/workflows/auto-approve-backports.yml @@ -5,16 +5,13 @@ on: types: - opened -env: - NODE_ENV: kibana-github-action - jobs: approve: name: Auto-approve backport runs-on: ubuntu-latest if: | contains(github.event.pull_request.labels.*.name, 'backport') && - github.event.pull_request.user.login == 'kibanamachine' + contains(github.base_ref, 'kibanamachine:backport') permissions: pull-requests: write steps: From f32fb36c49d1e314680118a8120f3793fa7e0ae4 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Wed, 28 Jun 2023 20:45:06 +0100 Subject: [PATCH 2/2] fix(NA): replace github.base_ref with github.head_ref --- .github/workflows/auto-approve-backports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-approve-backports.yml b/.github/workflows/auto-approve-backports.yml index 7b07b5bf45b84..1fa73930be059 100644 --- a/.github/workflows/auto-approve-backports.yml +++ b/.github/workflows/auto-approve-backports.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest if: | contains(github.event.pull_request.labels.*.name, 'backport') && - contains(github.base_ref, 'kibanamachine:backport') + contains(github.head_ref, 'kibanamachine:backport') permissions: pull-requests: write steps: