2 files changed, 28 insertions, 10 deletions

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 00f299ff1..ed9191c49 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -97,7 +97,13 @@ jobs:
 
   typescript:
     name: TypeScript
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    runs-on: ${{ matrix.os }}
+    
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
@@ -111,10 +117,19 @@ jobs:
       working-directory: ./editors/code
 
     - run: npm audit || { sleep 10 && npm audit; } || { sleep 30 && npm audit; }
+      if: runner.os == 'Linux'
       working-directory: ./editors/code
 
     - run: npm run lint
       working-directory: ./editors/code
 
+    - name: Run vscode tests
+      uses: GabrielBB/[email protected]
+      env:
+        VSCODE_CLI: 1
+      with:
+        run: npm --prefix ./editors/code test
+        # working-directory: ./editors/code  # does not work: https://github.com/GabrielBB/xvfb-action/issues/8
+
     - run: npm run package --scripts-prepend-node-path
       working-directory: ./editors/code
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 3f52f31f8..1ae8ed1b6 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -6,7 +6,7 @@ on:
   push:
     branches:
     - release
-    - nightly
+    - trigger-nightly
 
 env:
   CARGO_INCREMENTAL: 0
@@ -20,7 +20,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-16.04, windows-latest, macos-latest]
 
     steps:
     - name: Checkout repository
@@ -42,25 +42,25 @@ jobs:
         override: true
 
     - name: Install Nodejs
-      if: matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-16.04'
       uses: actions/setup-node@v1
       with:
         node-version: 12.x
 
     - name: Dist
-      if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/release'
+      if: matrix.os == 'ubuntu-16.04' && github.ref == 'refs/heads/release'
       run: cargo xtask dist --client 0.2.$GITHUB_RUN_NUMBER
 
     - name: Dist
-      if: matrix.os == 'ubuntu-latest' && github.ref != 'refs/heads/release'
+      if: matrix.os == 'ubuntu-16.04' && github.ref != 'refs/heads/release'
       run: cargo xtask dist --nightly --client 0.3.$GITHUB_RUN_NUMBER-nightly
 
     - name: Dist
-      if: matrix.os != 'ubuntu-latest'
+      if: matrix.os != 'ubuntu-16.04'
       run: cargo xtask dist
 
     - name: Nightly analysis-stats check
-      if: matrix.os == 'ubuntu-latest' && github.ref != 'refs/heads/release'
+      if: matrix.os == 'ubuntu-16.04' && github.ref != 'refs/heads/release'
       run: ./dist/rust-analyzer-linux analysis-stats .
 
     - name: Upload artifacts
@@ -71,7 +71,7 @@ jobs:
 
   publish:
     name: publish
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-16.04
     needs: ['dist']
     steps:
     - name: Install Nodejs
@@ -88,13 +88,16 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
 
+    - run: echo "::set-env name=HEAD_SHA::$(git rev-parse HEAD)"
+    - run: 'echo "HEAD_SHA: $HEAD_SHA"'
+
     - uses: actions/download-artifact@v1
       with:
         name: dist-macos-latest
         path: dist
     - uses: actions/download-artifact@v1
       with:
-        name: dist-ubuntu-latest
+        name: dist-ubuntu-16.04
         path: dist
     - uses: actions/download-artifact@v1
       with: