From d1848a11a229281e28f6d1f176ad1f4fe02dd9db Mon Sep 17 00:00:00 2001 From: Emil Lauridsen Date: Thu, 2 Jan 2020 15:08:36 +0100 Subject: Run tests on ubuntu, windows and macos --- .github/workflows/ci.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1d24295ec..0034ce49a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,7 +10,10 @@ on: jobs: rust: name: Rust - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] env: RUSTFLAGS: -D warnings CARGO_INCREMENTAL: 0 -- cgit v1.2.3 From 0f912c72cc698f875ef8c288493dc7af54e2ad69 Mon Sep 17 00:00:00 2001 From: Emil Lauridsen Date: Thu, 2 Jan 2020 15:54:44 +0100 Subject: Blindfolded PowerShell coding --- .github/workflows/ci.yaml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0034ce49a..8d3c2865c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -48,13 +48,29 @@ jobs: with: command: test - - name: Prepare build directory for cache + - name: Prepare build directory for cache (UNIX) + if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' run: | find ./target/debug -maxdepth 1 -type f -delete \ && rm -fr ./target/debug/{deps,.fingerprint}/{*ra_*,*heavy_test*,*gen_lsp*,*thread_worker*} \ && rm -f ./target/.rustc_info.json \ && rm ./target/.slow_tests_cookie + - name: Prepare build directory for cache (Windows) + if: matrix.os == 'windows-latest' + run: >- + (Get-ChildItem ./target/debug -Recurse -Depth 1 -File | Remove-Item) -and + (Remove-Item -Force -Recurse ./target/debug/deps/*ra_*) -and + (Remove-Item -Force -Recurse ./target/debug/deps/*heavy_test*) -and + (Remove-Item -Force -Recurse ./target/debug/deps/*gen_lsp*) -and + (Remove-Item -Force -Recurse ./target/debug/deps/*thread_worker*) -and + (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*ra_*) -and + (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*heavy_test*) -and + (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*gen_lsp*) -and + (Remove-Item -Force -Recurse ./target/debug/.fingerprint/*thread_worker*) -and + (Remove-Item -Force ./target/.rustc_info.json) -and + (Remove-Item ./target/.slow_tests_cookie) + type-script: name: TypeScript runs-on: ubuntu-latest -- cgit v1.2.3 From 980f4fb79dcee0cca5456072131a3b5bfb21b75d Mon Sep 17 00:00:00 2001 From: Emil Lauridsen Date: Thu, 2 Jan 2020 16:23:16 +0100 Subject: Update bors.toml --- bors.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bors.toml b/bors.toml index 7ffbc9294..4a0e0c5e4 100644 --- a/bors.toml +++ b/bors.toml @@ -1,2 +1,7 @@ -status = ["Rust", "TypeScript"] +status = [ + 'Rust (ubuntu-latest)' + 'Rust (windows-latest)', + 'Rust (macos-latest)', + "TypeScript" +] delete_merged_branches = true -- cgit v1.2.3 From 89a11eb811e82953b8ae5d5f688e607d20f66436 Mon Sep 17 00:00:00 2001 From: Emil Lauridsen Date: Fri, 3 Jan 2020 20:42:27 +0100 Subject: Remove rust-docs on Windows before updating to latest stable --- .github/workflows/ci.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8d3c2865c..733d9ce45 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,6 +23,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v1 + - name: Cleanup Rust components (Windows) + if: matrix.os == 'windows-latest' + run: rustup component remove rust-docs + - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: -- cgit v1.2.3 From e997749a9c2537b8bd4c894aa14a8db9158a1c73 Mon Sep 17 00:00:00 2001 From: Emil Lauridsen Date: Fri, 3 Jan 2020 20:53:15 +0100 Subject: Rename old toolchains on windows to speedup installation --- .github/workflows/ci.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 733d9ce45..abdec602e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,9 +23,13 @@ jobs: - name: Checkout repository uses: actions/checkout@v1 - - name: Cleanup Rust components (Windows) + # We need to disable the existing toolchain to avoid updating rust-docs + # which takes a long time. The fastest way to do this is to rename the + # existing folder, as deleting it takes about as much time as not doing + # anything and just updating rust-docs. + - name: Rename existing rust toolchain (Windows) if: matrix.os == 'windows-latest' - run: rustup component remove rust-docs + run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old - name: Install Rust toolchain uses: actions-rs/toolchain@v1 -- cgit v1.2.3 From 0de029c466f6b7a18e8ec633fc34e93881b25774 Mon Sep 17 00:00:00 2001 From: Emil Lauridsen Date: Sun, 5 Jan 2020 19:58:54 +0100 Subject: Add missing comma and use double-quotes to bors.toml --- bors.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bors.toml b/bors.toml index 4a0e0c5e4..0bc71860f 100644 --- a/bors.toml +++ b/bors.toml @@ -1,7 +1,7 @@ status = [ - 'Rust (ubuntu-latest)' - 'Rust (windows-latest)', - 'Rust (macos-latest)', + "Rust (ubuntu-latest)", + "Rust (windows-latest)", + "Rust (macos-latest)", "TypeScript" ] delete_merged_branches = true -- cgit v1.2.3