Skip to content

Commit 7fece3b

Browse files
committed
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer into modname_spacing
2 parents db92621 + 59732df commit 7fece3b

File tree

443 files changed

+26819
-17921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

443 files changed

+26819
-17921
lines changed

.github/workflows/release.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ${{ matrix.os }}
2121
strategy:
2222
matrix:
23-
os: [ubuntu-latest, windows-latest, macos-latest]
23+
os: [ubuntu-16.04, windows-latest, macos-latest]
2424

2525
steps:
2626
- name: Checkout repository
@@ -42,25 +42,25 @@ jobs:
4242
override: true
4343

4444
- name: Install Nodejs
45-
if: matrix.os == 'ubuntu-latest'
45+
if: matrix.os == 'ubuntu-16.04'
4646
uses: actions/setup-node@v1
4747
with:
4848
node-version: 12.x
4949

5050
- name: Dist
51-
if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/release'
51+
if: matrix.os == 'ubuntu-16.04' && github.ref == 'refs/heads/release'
5252
run: cargo xtask dist --client 0.2.$GITHUB_RUN_NUMBER
5353

5454
- name: Dist
55-
if: matrix.os == 'ubuntu-latest' && github.ref != 'refs/heads/release'
55+
if: matrix.os == 'ubuntu-16.04' && github.ref != 'refs/heads/release'
5656
run: cargo xtask dist --nightly --client 0.3.$GITHUB_RUN_NUMBER-nightly
5757

5858
- name: Dist
59-
if: matrix.os != 'ubuntu-latest'
59+
if: matrix.os != 'ubuntu-16.04'
6060
run: cargo xtask dist
6161

6262
- name: Nightly analysis-stats check
63-
if: matrix.os == 'ubuntu-latest' && github.ref != 'refs/heads/release'
63+
if: matrix.os == 'ubuntu-16.04' && github.ref != 'refs/heads/release'
6464
run: ./dist/rust-analyzer-linux analysis-stats .
6565

6666
- name: Upload artifacts
@@ -71,7 +71,7 @@ jobs:
7171

7272
publish:
7373
name: publish
74-
runs-on: ubuntu-latest
74+
runs-on: ubuntu-16.04
7575
needs: ['dist']
7676
steps:
7777
- name: Install Nodejs
@@ -94,7 +94,7 @@ jobs:
9494
path: dist
9595
- uses: actions/download-artifact@v1
9696
with:
97-
name: dist-ubuntu-latest
97+
name: dist-ubuntu-16.04
9898
path: dist
9999
- uses: actions/download-artifact@v1
100100
with:

0 commit comments

Comments
 (0)