From b37d5db8df46c5904bf048d16a20f4f12aad0334 Mon Sep 17 00:00:00 2001 From: Michael Sproul Date: Mon, 21 Feb 2022 23:21:03 +0000 Subject: [PATCH] Increase Bors timeout, refine target-branch-check (#3035) ## Issue Addressed Timeouts due to Windows builds running for 2h 20m. ## Proposed Changes * Increase Bors timeout to 3h * Refine the target branch check so that it will pass when we make PRs to feature branches. This is just an extra change I've been meaning to sneak in for a while. ## Additional Info * I think it would also be cool to try caching for CI again, but that's a separate issue and we'll still need the long timeout on a cache miss. --- .github/workflows/test-suite.yml | 4 ++-- bors.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 04f7659fe..919bdbac2 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -19,8 +19,8 @@ jobs: runs-on: ubuntu-latest if: github.event_name == 'pull_request' steps: - - name: Check that pull request is targeting unstable branch - run: test ${{ github.base_ref }} = "unstable" + - name: Check that the pull request is not targeting the stable branch + run: test ${{ github.base_ref }} != "stable" cargo-fmt: name: cargo-fmt runs-on: ubuntu-latest diff --git a/bors.toml b/bors.toml index ae1b03e9b..3c6826a9e 100644 --- a/bors.toml +++ b/bors.toml @@ -16,5 +16,5 @@ status = [ "cargo-udeps" ] use_squash_merge = true -timeout_sec = 7200 +timeout_sec = 10800 pr_status = ["license/cla", "target-branch-check"]