From 5316d08c31136bed21ce52c15116211b3e58238c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= Date: Fri, 7 Jan 2022 01:44:24 +0100 Subject: [PATCH] Update Github Action for backport (#122479) --- .backportrc.json | 3 ++- .github/workflows/backport.yml | 1 - package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.backportrc.json b/.backportrc.json index b0311fbbeccf1..14cb04da188d4 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -41,5 +41,6 @@ "^v(\\d+).(\\d+).\\d+$": "$1.$2" }, "autoMerge": true, - "autoMergeMethod": "squash" + "autoMergeMethod": "squash", + "backportBinary": "node scripts/backport" } diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index bcb59caa40887..5ba208a45766e 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -41,4 +41,3 @@ jobs: commit_email: 42973632+kibanamachine@users.noreply.github.com auto_merge: 'true' auto_merge_method: 'squash' - manual_backport_command_template: 'node scripts/backport --pr %pullNumber%' diff --git a/package.json b/package.json index f31baf75e07af..e6be8c8f1f068 100644 --- a/package.json +++ b/package.json @@ -711,7 +711,7 @@ "babel-plugin-require-context-hook": "^1.0.0", "babel-plugin-styled-components": "^2.0.2", "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "backport": "^6.1.1", + "backport": "^6.1.3", "callsites": "^3.1.0", "chai": "3.5.0", "chance": "1.0.18", diff --git a/yarn.lock b/yarn.lock index d564d3bce5282..e19fac5e0a395 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8656,10 +8656,10 @@ bach@^1.0.0: async-settle "^1.0.0" now-and-later "^2.0.0" -backport@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/backport/-/backport-6.1.1.tgz#bf511fe2f26b8b85c25165a5bc6f390517bc39e5" - integrity sha512-J0U6bWckG655Wf9/u5Q7rl/urJ4JIWrQD6hXKdq03lDX/RfqPKqhWvWgPhOGAKssb5Y0A2g4AonWQhn0MOwdYQ== +backport@^6.1.3: + version "6.1.3" + resolved "https://registry.yarnpkg.com/backport/-/backport-6.1.3.tgz#48a0a8b8eadf422c475f816199390ef06fad16e0" + integrity sha512-LMSXgUOFI9G/Eu4hZDaC7uQwmpedGSxihxVpVcQYwxfdKgMAsYLRwf2R0uQZaWWzTepbpyN9SXvTR5FnacVSFA== dependencies: "@octokit/rest" "^18.12.0" axios "^0.24.0"