Merge #11107

[rust.git] / .github / workflows / ci.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f781e0987a272964f20afad08acda53360a94916..baefd8bc1f0b388a908d1b578332ccb2ffc772cb 100644 (file)
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -17,6 +17,7 @@ env:
 
 jobs:
   rust:
+    if: github.repository == 'rust-analyzer/rust-analyzer'
     name: Rust
     runs-on: ${{ matrix.os }}
     env:
@@ -61,6 +62,7 @@ jobs:
 
   # Weird targets to catch non-portable code
   rust-cross:
+    if: github.repository == 'rust-analyzer/rust-analyzer'
     name: Rust Cross
     runs-on: ubuntu-latest
 
@@ -97,6 +99,7 @@ jobs:
         done
 
   typescript:
+    if: github.repository == 'rust-analyzer/rust-analyzer'
     name: TypeScript
     strategy:
       fail-fast: false
@@ -112,7 +115,11 @@ jobs:
     - name: Install Nodejs
       uses: actions/setup-node@v1
       with:
-        node-version: 12.x
+        node-version: 14.x
+
+    - name: Install xvfb
+      if: matrix.os == 'ubuntu-latest'
+      run: sudo apt-get install -y xvfb
 
     - run: npm ci
       working-directory: ./editors/code
@@ -124,13 +131,19 @@ jobs:
     - run: npm run lint
       working-directory: ./editors/code
 
-    - name: Run vscode tests
-      uses: GabrielBB/xvfb-action@v1.2
+    - name: Run VS Code tests (Linux)
+      if: matrix.os == 'ubuntu-latest'
       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: xvfb-run npm test
+      working-directory: ./editors/code
+
+    - name: Run VS Code tests (Windows)
+      if: matrix.os == 'windows-latest'
+      env:
+        VSCODE_CLI: 1
+      run: npm test
+      working-directory: ./editors/code
 
     - run: npm run pretest
       working-directory: ./editors/code