diff options
| author | Dmitry <[email protected]> | 2020-08-18 13:37:22 +0100 |
|---|---|---|
| committer | Dmitry <[email protected]> | 2020-08-18 13:37:22 +0100 |
| commit | e18748ed152989953e39492a6b44f8001267ce5f (patch) | |
| tree | 300dc7ce2998d9521319ff76f4df6ec2d165d0a1 /.github | |
| parent | 73315c9168901ef6d676f017daaa9b4976380c03 (diff) | |
| parent | b8dfc331abbfce6aad0c248c91c57bd9890a668f (diff) | |
Merge remote-tracking branch 'rust-analyzer/master'
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yaml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2deb009ce..fb077e28d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml | |||
| @@ -25,7 +25,7 @@ jobs: | |||
| 25 | strategy: | 25 | strategy: |
| 26 | fail-fast: false | 26 | fail-fast: false |
| 27 | matrix: | 27 | matrix: |
| 28 | os: [ubuntu-latest, windows-latest] #, macos-latest] | 28 | os: [ubuntu-latest, windows-latest, macos-latest] |
| 29 | 29 | ||
| 30 | steps: | 30 | steps: |
| 31 | - name: Checkout repository | 31 | - name: Checkout repository |
| @@ -70,10 +70,6 @@ jobs: | |||
| 70 | - name: Prepare cache | 70 | - name: Prepare cache |
| 71 | run: cargo xtask pre-cache | 71 | run: cargo xtask pre-cache |
| 72 | 72 | ||
| 73 | - name: Prepare cache 2 | ||
| 74 | if: matrix.os == 'windows-latest' | ||
| 75 | run: Remove-Item ./target/debug/xtask.exe, ./target/debug/deps/xtask.exe | ||
| 76 | |||
| 77 | # Weird targets to catch non-portable code | 73 | # Weird targets to catch non-portable code |
| 78 | rust-cross: | 74 | rust-cross: |
| 79 | name: Rust Cross | 75 | name: Rust Cross |