Skip to content

Commit 01e9903

Browse files
author
Benjamin Pasero
authored
Try to fix Linux GH CI (microsoft#89323)
* test * test
1 parent b2f1dda commit 01e9903

2 files changed

Lines changed: 40 additions & 41 deletions

File tree

.github/workflows/ci.yml

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -11,45 +11,44 @@ on:
1111
- release/*
1212

1313
jobs:
14-
# https://github.com/microsoft/vscode/issues/89147
15-
# linux:
16-
# runs-on: ubuntu-latest
17-
# env:
18-
# CHILD_CONCURRENCY: "1"
19-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20-
# steps:
21-
# - uses: actions/checkout@v1
22-
# # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
23-
# - run: |
24-
# sudo apt-get update
25-
# sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0
26-
# sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
27-
# sudo chmod +x /etc/init.d/xvfb
28-
# sudo update-rc.d xvfb defaults
29-
# sudo service xvfb start
30-
# name: Setup Build Environment
31-
# - uses: actions/setup-node@v1
32-
# with:
33-
# node-version: 10
34-
# # TODO: cache node modules
35-
# - run: yarn --frozen-lockfile
36-
# name: Install Dependencies
37-
# - run: yarn electron x64
38-
# name: Download Electron
39-
# - run: yarn gulp hygiene
40-
# name: Run Hygiene Checks
41-
# - run: yarn monaco-compile-check
42-
# name: Run Monaco Editor Checks
43-
# - run: yarn valid-layers-check
44-
# name: Run Valid Layers Checks
45-
# - run: yarn compile
46-
# name: Compile Sources
47-
# - run: yarn download-builtin-extensions
48-
# name: Download Built-in Extensions
49-
# - run: DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
50-
# name: Run Unit Tests
51-
# - run: DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
52-
# name: Run Integration Tests
14+
linux:
15+
runs-on: ubuntu-latest
16+
env:
17+
CHILD_CONCURRENCY: "1"
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19+
steps:
20+
- uses: actions/checkout@v1
21+
# TODO: rename azure-pipelines/linux/xvfb.init to github-actions
22+
- run: |
23+
sudo apt-get update
24+
sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0
25+
sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
26+
sudo chmod +x /etc/init.d/xvfb
27+
sudo update-rc.d xvfb defaults
28+
sudo service xvfb start
29+
name: Setup Build Environment
30+
- uses: actions/setup-node@v1
31+
with:
32+
node-version: 10
33+
# TODO: cache node modules
34+
- run: yarn --frozen-lockfile
35+
name: Install Dependencies
36+
- run: yarn electron x64
37+
name: Download Electron
38+
- run: yarn gulp hygiene
39+
name: Run Hygiene Checks
40+
- run: yarn monaco-compile-check
41+
name: Run Monaco Editor Checks
42+
- run: yarn valid-layers-check
43+
name: Run Valid Layers Checks
44+
- run: yarn compile
45+
name: Compile Sources
46+
- run: yarn download-builtin-extensions
47+
name: Download Built-in Extensions
48+
- run: DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
49+
name: Run Unit Tests
50+
- run: DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
51+
name: Run Integration Tests
5352

5453
windows:
5554
runs-on: windows-2016

build/azure-pipelines/linux/xvfb.init

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
[ "${NETWORKING}" = "no" ] && exit 0
2020

2121
PROG="/usr/bin/Xvfb"
22-
PROG_OPTIONS=":10 -ac"
22+
PROG_OPTIONS=":10 -ac -screen 0 1024x768x24"
2323
PROG_OUTPUT="/tmp/Xvfb.out"
2424

2525
case "$1" in
@@ -50,4 +50,4 @@ case "$1" in
5050
exit 1
5151
esac
5252

53-
exit $RETVAL
53+
exit $RETVAL

0 commit comments

Comments
 (0)