Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f68b493

Browse files
author
Teffen
authoredNov 10, 2021
Merge branch 'main' into openvsx-switch
2 parents 6a53c2b + 1b60ef4 commit f68b493

Some content is hidden

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

55 files changed

+2414
-3115
lines changed
 

‎.github/lock.yml

-37
This file was deleted.

‎.github/workflows/ci.yaml

+34-34
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ jobs:
1919
name: Pre-build checks
2020
runs-on: ubuntu-latest
2121
timeout-minutes: 15
22-
env:
23-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
2422
steps:
2523
- name: Checkout repo
2624
uses: actions/checkout@v2
@@ -33,14 +31,18 @@ jobs:
3331
- name: Install helm
3432
uses: azure/setup-helm@v1.1
3533

36-
- name: Fetch dependencies from cache
37-
id: cache-yarn
38-
uses: actions/cache@v2
39-
with:
40-
path: "**/node_modules"
41-
key: yarn-build-${{ hashFiles('**/yarn.lock') }}
42-
restore-keys: |
43-
yarn-build-
34+
# NOTE@jsjoeio
35+
# disabling this until we can audit the build process
36+
# and the usefulness of this step
37+
# See: https://github.com/cdr/code-server/issues/4287
38+
# - name: Fetch dependencies from cache
39+
# id: cache-yarn
40+
# uses: actions/cache@v2
41+
# with:
42+
# path: "**/node_modules"
43+
# key: yarn-build-${{ hashFiles('**/yarn.lock') }}
44+
# restore-keys: |
45+
# yarn-build-
4446

4547
- name: Install dependencies
4648
# if: steps.cache-yarn.outputs.cache-hit != 'true'
@@ -54,19 +56,11 @@ jobs:
5456
run: yarn lint
5557
if: success()
5658

57-
- name: Run code-server unit tests
58-
run: yarn test:unit
59-
if: success()
60-
61-
- name: Upload coverage report to Codecov
62-
run: yarn coverage
63-
if: success()
64-
6559
audit-ci:
6660
name: Run audit-ci
6761
needs: prebuild
6862
runs-on: ubuntu-latest
69-
timeout-minutes: 5
63+
timeout-minutes: 15
7064
steps:
7165
- name: Checkout repo
7266
uses: actions/checkout@v2
@@ -98,6 +92,8 @@ jobs:
9892
needs: prebuild
9993
runs-on: ubuntu-latest
10094
timeout-minutes: 30
95+
env:
96+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
10197
steps:
10298
- uses: actions/checkout@v2
10399
with:
@@ -146,14 +142,25 @@ jobs:
146142
path: |
147143
vendor/modules/code-oss-dev/.build
148144
vendor/modules/code-oss-dev/out-build
149-
vendor/modules/code-oss-dev/out-vscode
150-
vendor/modules/code-oss-dev/out-vscode-min
151-
key: vscode-build-${{ steps.vscode-rev.outputs.rev }}
145+
vendor/modules/code-oss-dev/out-vscode-reh-web
146+
vendor/modules/code-oss-dev/out-vscode-reh-web-min
147+
key: vscode-reh-build-${{ steps.vscode-rev.outputs.rev }}
152148

153149
- name: Build vscode
154150
if: steps.cache-vscode.outputs.cache-hit != 'true'
155151
run: yarn build:vscode
156152

153+
# Our code imports code from VS Code's `out` directory meaning VS Code
154+
# must be built before running these tests.
155+
# TODO: Move to its own step?
156+
- name: Run code-server unit tests
157+
run: yarn test:unit
158+
if: success()
159+
160+
- name: Upload coverage report to Codecov
161+
run: yarn coverage
162+
if: success()
163+
157164
# The release package does not contain any native modules
158165
# and is neutral to architecture/os/libc version.
159166
- name: Create release package
@@ -283,7 +290,7 @@ jobs:
283290
echo "$HOME/.local/bin" >> $GITHUB_PATH
284291
285292
- name: Install cross-compiler
286-
run: sudo apt install $PACKAGE
293+
run: sudo apt update && sudo apt install $PACKAGE
287294
env:
288295
PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
289296

@@ -371,9 +378,6 @@ jobs:
371378
with:
372379
node-version: "14"
373380

374-
- name: Install playwright OS dependencies
375-
run: npx playwright install-deps
376-
377381
- name: Fetch dependencies from cache
378382
id: cache-yarn
379383
uses: actions/cache@v2
@@ -399,14 +403,10 @@ jobs:
399403
if: steps.cache-yarn.outputs.cache-hit != 'true'
400404
run: yarn --frozen-lockfile
401405

402-
# HACK: this shouldn't need to exist, but put it here anyway
403-
# in an attempt to solve Playwright cache failures.
404-
- name: Reinstall playwright
405-
if: steps.cache-yarn.outputs.cache-hit == 'true'
406+
- name: Install Playwright OS dependencies
406407
run: |
407-
cd test/
408-
rm -r node_modules/playwright
409-
yarn install --check-files
408+
./test/node_modules/.bin/playwright install-deps
409+
./test/node_modules/.bin/playwright install
410410
411411
- name: Run end-to-end tests
412412
run: yarn test:e2e
@@ -428,7 +428,7 @@ jobs:
428428
uses: actions/checkout@v2
429429
- name: Run Trivy vulnerability scanner in repo mode
430430
#Commit SHA for v0.0.17
431-
uses: aquasecurity/trivy-action@8eccb5539730451af599c84f444c6d6cf0fc2bb0
431+
uses: aquasecurity/trivy-action@1ccef265f594a7555a720f623a461a3d69b45bf7
432432
with:
433433
scan-type: "fs"
434434
scan-ref: "."

0 commit comments

Comments
 (0)
Please sign in to comment.