From 80e3d1a98e508684656433f03c0c28fd55ebc95c Mon Sep 17 00:00:00 2001 From: Linard Arquint Date: Tue, 5 Dec 2023 11:34:32 +0100 Subject: [PATCH 1/2] Updates update-submodules.yml --- .github/workflows/update-submodules.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml index 7718759f..9440c20e 100644 --- a/.github/workflows/update-submodules.yml +++ b/.github/workflows/update-submodules.yml @@ -51,9 +51,6 @@ jobs: * Updates Gobra from `${{ env.PREV_GOBRA_REF }}` to `${{ env.CUR_GOBRA_REF }}`. - name: Enable auto-merge of PR - uses: peter-evans/create-or-update-comment@v2 - if: env.PREV_GOBRA_REF != env.CUR_GOBRA_REF - with: - token: ${{ secrets.VIPER_ADMIN_TOKEN }} - issue-number: ${{ steps.pr.outputs.pull-request-number }} - body: bors merge + run: gh pr merge --merge --auto "${{ steps.pr.outputs.pull-request-number }}" + env: + GH_TOKEN: ${{ secrets.VIPER_ADMIN_TOKEN }} From ec52c14fec5b4eb4c412597d07c94fbe675481cf Mon Sep 17 00:00:00 2001 From: Linard Arquint Date: Tue, 5 Dec 2023 11:35:14 +0100 Subject: [PATCH 2/2] Deletes bors.toml --- bors.toml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 bors.toml diff --git a/bors.toml b/bors.toml deleted file mode 100644 index ab457bfc..00000000 --- a/bors.toml +++ /dev/null @@ -1,8 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright (c) 2011-2022 ETH Zurich. - -status = ["check-license-headers", "build-and-test-client - macos-latest", "build-and-test-client - ubuntu-latest", "build-and-test-client - windows-latest"] -timeout_sec = 7200