From 7ac6a5f9d66f8716412dedc9826b1793ca9146c3 Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Wed, 13 Apr 2022 22:33:43 +1000 Subject: [PATCH] Stop dependabot's auto rebase It can race condition with bors. Let bors merge handle the rebasing. --- .github/dependabot.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 790bd89328..045b22da74 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,6 +9,8 @@ updates: # Update the npm manifest file to relax # the version requirements as js-waku is a library versioning-strategy: widen + # Do not auto rebase, let bors handle this + rebase-strategy: "disabled" - package-ecosystem: "npm" directory: "/examples/web-chat" schedule: @@ -18,6 +20,8 @@ updates: - dependency-name: "*" update-types: ["version-update:semver-patch", "version-update:semver-minor"] + # Do not auto rebase, let bors handle this + rebase-strategy: "disabled" - package-ecosystem: "npm" directory: "/examples/relay-reactjs-chat" schedule: @@ -27,6 +31,8 @@ updates: - dependency-name: "*" update-types: ["version-update:semver-patch", "version-update:semver-minor"] + # Do not auto rebase, let bors handle this + rebase-strategy: "disabled" - package-ecosystem: "npm" directory: "/examples/store-reactjs-chat" schedule: @@ -36,6 +42,8 @@ updates: - dependency-name: "*" update-types: ["version-update:semver-patch", "version-update:semver-minor"] + # Do not auto rebase, let bors handle this + rebase-strategy: "disabled" - package-ecosystem: "npm" directory: "/examples/eth-pm" schedule: @@ -45,6 +53,8 @@ updates: - dependency-name: "*" update-types: ["version-update:semver-patch", "version-update:semver-minor"] + # Do not auto rebase, let bors handle this + rebase-strategy: "disabled" - package-ecosystem: "npm" directory: "/examples/eth-pm-wallet-encryption" schedule: @@ -54,6 +64,8 @@ updates: - dependency-name: "*" update-types: ["version-update:semver-patch", "version-update:semver-minor"] + # Do not auto rebase, let bors handle this + rebase-strategy: "disabled" - package-ecosystem: "npm" directory: "/examples/relay-angular-chat" schedule: @@ -63,3 +75,5 @@ updates: - dependency-name: "*" update-types: ["version-update:semver-patch", "version-update:semver-minor"] + # Do not auto rebase, let bors handle this + rebase-strategy: "disabled"