diff --git a/.github/bors.toml b/.github/bors.toml index ca42be0..db5293e 100644 --- a/.github/bors.toml +++ b/.github/bors.toml @@ -2,3 +2,4 @@ block_labels = ["needs-decision"] delete_merged_branches = true required_approvals = 1 status = ["continuous-integration/travis-ci/push"] +timeout_sec = 7200 diff --git a/.travis.yml b/.travis.yml index b9f17af..7eea972 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,7 @@ matrix: if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) # MSRV - - env: TARGET=x86_64-unknown-linux-gnu + - env: TARGET=x86_64-unknown-linux-gnu DISABLE_TESTS=1 rust: 1.39.0 if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)