From 4432bb0f19dbc345b8f1ae89e10f1d79a3ede0f9 Mon Sep 17 00:00:00 2001 From: Rongrong Date: Fri, 6 May 2022 09:35:19 +0800 Subject: [PATCH] chore(*): fix improper @pull[bot] config (#9710) Signed-off-by: Rongrong --- .github/pull.yml | 7 +++++++ scripts/workflow/test-route/identify.js | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .github/pull.yml diff --git a/.github/pull.yml b/.github/pull.yml new file mode 100644 index 000000000..8dc69160d --- /dev/null +++ b/.github/pull.yml @@ -0,0 +1,7 @@ +version: '1' +rules: + - base: master + upstream: diygod:master + # default value if this file does not exist is `hardreset`, effectively overwriting any downstream changes! + # previously it was the misconfigured PR route test workflow that rescued downstream changes from being overwritten + mergeMethod: merge diff --git a/scripts/workflow/test-route/identify.js b/scripts/workflow/test-route/identify.js index d4d1f7eae..c2b30a774 100644 --- a/scripts/workflow/test-route/identify.js +++ b/scripts/workflow/test-route/identify.js @@ -1,5 +1,5 @@ const noFound = 'Auto: Route No Found'; -const whiteListedUser = ['dependabot[bot]']; +const whiteListedUser = ['dependabot[bot]', 'pull[bot]']; // dependabot and downstream PR requested by pull[bot] module.exports = async ({ github, context, core }, body, number, sender) => { core.debug(`sender: ${sender}`);