Skip to content

Commit a0dfcbf

Browse files
committed
DO NOT RELEASE: Force using an older version of the cli
1 parent d98293e commit a0dfcbf

File tree

2 files changed

+30
-27
lines changed

2 files changed

+30
-27
lines changed

.github/workflows/main.yml

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ${{ matrix.os }}
88
strategy:
99
matrix:
10-
os: [ubuntu-latest, windows-latest]
10+
os: [windows-latest]
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v2
@@ -25,25 +25,25 @@ jobs:
2525
npm run build-ci
2626
shell: bash
2727

28-
- name: Prepare artifacts
29-
if: matrix.os == 'ubuntu-latest'
30-
run: |
31-
mkdir artifacts
32-
cp dist/*.vsix artifacts
28+
# - name: Prepare artifacts
29+
# if: matrix.os == 'ubuntu-latest'
30+
# run: |
31+
# mkdir artifacts
32+
# cp dist/*.vsix artifacts
3333

34-
- name: Upload artifacts
35-
uses: actions/upload-artifact@master
36-
if: matrix.os == 'ubuntu-latest'
37-
with:
38-
name: vscode-codeql-extension
39-
path: artifacts
34+
# - name: Upload artifacts
35+
# uses: actions/upload-artifact@master
36+
# if: matrix.os == 'ubuntu-latest'
37+
# with:
38+
# name: vscode-codeql-extension
39+
# path: artifacts
4040

4141
test:
4242
name: Test
4343
runs-on: ${{ matrix.os }}
4444
strategy:
4545
matrix:
46-
os: [ubuntu-latest, windows-latest]
46+
os: [windows-latest]
4747
steps:
4848
- name: Checkout
4949
uses: actions/checkout@v2
@@ -56,25 +56,27 @@ jobs:
5656

5757
# We have to build the dependencies in `lib` before running any tests.
5858
- name: Build
59+
if: matrix.os == 'windows-latest'
5960
run: |
6061
cd build
6162
npm install
6263
npm run build-ci
6364
shell: bash
6465

6566
- name: Install CodeQL
67+
if: matrix.os == 'windows-latest'
6668
run: |
6769
mkdir codeql-home
6870
curl -L --silent https://github.com/github/codeql-cli-binaries/releases/latest/download/codeql.zip -o codeql-home/codeql.zip
6971
unzip -q -o codeql-home/codeql.zip -d codeql-home
7072
rm codeql-home/codeql.zip
7173
shell: bash
7274

73-
- name: Run unit tests (Linux)
74-
if: matrix.os == 'ubuntu-latest'
75-
run: |
76-
cd extensions/ql-vscode
77-
CODEQL_PATH=$GITHUB_WORKSPACE/codeql-home/codeql/codeql npm run test
75+
# - name: Run unit tests (Linux)
76+
# if: matrix.os == 'ubuntu-latest'
77+
# run: |
78+
# cd extensions/ql-vscode
79+
# CODEQL_PATH=$GITHUB_WORKSPACE/codeql-home/codeql/codeql npm run test
7880

7981
- name: Run unit tests (Windows)
8082
if: matrix.os == 'windows-latest'
@@ -83,12 +85,12 @@ jobs:
8385
$env:CODEQL_PATH=$(Join-Path $env:GITHUB_WORKSPACE -ChildPath 'codeql-home/codeql/codeql.exe')
8486
npm run test
8587
86-
- name: Run integration tests (Linux)
87-
if: matrix.os == 'ubuntu-latest'
88-
run: |
89-
cd extensions/ql-vscode
90-
sudo apt-get install xvfb
91-
/usr/bin/xvfb-run npm run integration
88+
# - name: Run integration tests (Linux)
89+
# if: matrix.os == 'ubuntu-latest'
90+
# run: |
91+
# cd extensions/ql-vscode
92+
# sudo apt-get install xvfb
93+
# /usr/bin/xvfb-run npm run integration
9294

9395
- name: Run integration tests (Windows)
9496
if: matrix.os == 'windows-latest'

extensions/ql-vscode/src/cli.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -648,9 +648,10 @@ export function spawnServer(
648648
}
649649
logger.log(`Starting ${name} using CodeQL CLI: ${base} ${argsString}`);
650650
const child = child_process.spawn(base, args);
651-
if (!child || !child.pid) {
652-
throw new Error(`Failed to start ${name} using command ${base} ${argsString}.`);
653-
}
651+
// TODO: Do not commit
652+
// if (!child || !child.pid) {
653+
// throw new Error(`Failed to start ${name} using command ${base} ${argsString}.`);
654+
// }
654655

655656
// Set up event listeners.
656657
child.on('close', (code) => logger.log(`Child process exited with code ${code}`));

0 commit comments

Comments
 (0)