aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-02-12 16:45:58 +0000
committerGitHub <[email protected]>2021-02-12 16:45:58 +0000
commitcf44953210cbfe189043417690fabd0037a6e74e (patch)
tree357232094eb1bc5a98362fb6ec2d6d65160573be /.github
parent777d936c17631dfc32a37bd919e45597b83349e4 (diff)
parent8c196056d5d51b0c7395eab399f548fc38b9573b (diff)
Merge #7652
7652: Fix slow tests sometimes failing r=flodiebold a=flodiebold In some situations we reloaded the workspace in the tests after having reported to be ready. There's two fixes here: 1. Add a version to the VFS config and include that version in progress reports, so that we don't think we're done prematurely; 2. Delay status transitions until after changes are applied. Otherwise the last change during loading can potentially trigger a workspace reload, if it contains interesting changes. Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/ci.yaml10
1 files changed, 1 insertions, 9 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ec9ef59a8..1850068a3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -53,19 +53,11 @@ jobs:
53 - name: Install Rust toolchain 53 - name: Install Rust toolchain
54 uses: actions-rs/toolchain@v1 54 uses: actions-rs/toolchain@v1
55 with: 55 with:
56 toolchain: 1.49.0 # FIXME: CI is failing on 1.50 56 toolchain: stable
57 profile: minimal 57 profile: minimal
58 override: true 58 override: true
59 components: rustfmt, rust-src 59 components: rustfmt, rust-src
60 60
61 - name: Install rustfmt
62 uses: actions-rs/toolchain@v1
63 with:
64 toolchain: stable
65 profile: minimal
66 override: false
67 components: rustfmt
68
69 - name: Cache cargo directories 61 - name: Cache cargo directories
70 uses: actions/cache@v2 62 uses: actions/cache@v2
71 with: 63 with: