Skip to content

Commit e6077cd

Browse files
jsjoeiojsjoeio
authored
Merge branch 'main' into jsjoeio-update-vscode-164
2 parents 0910d00 + b018112 commit e6077cd

30 files changed

+387
-67
lines changed

‎.github/workflows/ci.yaml

+29-22
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ on:
88
branches:
99
- main
1010

11+
# Cancel in-progress runs for pull requests when developers push
12+
# additional changes, and serialize builds in branches.
13+
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.ref }}
16+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
17+
1118
# Note: if: success() is used in several jobs -
1219
# this ensures that it only executes if all previous jobs succeeded.
1320

@@ -21,10 +28,10 @@ jobs:
2128
timeout-minutes: 15
2229
steps:
2330
- name: Checkout repo
24-
uses: actions/checkout@v2
31+
uses: actions/checkout@v3
2532

2633
- name: Install Node.js v14
27-
uses: actions/setup-node@v2
34+
uses: actions/setup-node@v3
2835
with:
2936
node-version: "14"
3037

@@ -63,10 +70,10 @@ jobs:
6370
timeout-minutes: 15
6471
steps:
6572
- name: Checkout repo
66-
uses: actions/checkout@v2
73+
uses: actions/checkout@v3
6774

6875
- name: Install Node.js v14
69-
uses: actions/setup-node@v2
76+
uses: actions/setup-node@v3
7077
with:
7178
node-version: "14"
7279

@@ -95,12 +102,12 @@ jobs:
95102
env:
96103
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
97104
steps:
98-
- uses: actions/checkout@v2
105+
- uses: actions/checkout@v3
99106
with:
100107
fetch-depth: 0
101108

102109
- name: Install Node.js v14
103-
uses: actions/setup-node@v2
110+
uses: actions/setup-node@v3
104111
with:
105112
node-version: "14"
106113

@@ -189,9 +196,9 @@ jobs:
189196
if: github.event.pull_request.head.repo.full_name == github.repository
190197
runs-on: ubuntu-latest
191198
steps:
192-
- uses: actions/checkout@v2
199+
- uses: actions/checkout@v3
193200

194-
- uses: actions/download-artifact@v2
201+
- uses: actions/download-artifact@v3
195202
id: download
196203
with:
197204
name: "npm-package"
@@ -218,10 +225,10 @@ jobs:
218225
container: "centos:7"
219226

220227
steps:
221-
- uses: actions/checkout@v2
228+
- uses: actions/checkout@v3
222229

223230
- name: Install Node.js v14
224-
uses: actions/setup-node@v2
231+
uses: actions/setup-node@v3
225232
with:
226233
node-version: "14"
227234

@@ -242,7 +249,7 @@ jobs:
242249
run: npm install -g yarn
243250

244251
- name: Download npm package
245-
uses: actions/download-artifact@v2
252+
uses: actions/download-artifact@v3
246253
with:
247254
name: npm-package
248255

@@ -307,10 +314,10 @@ jobs:
307314
NODE_VERSION: v14.17.4
308315

309316
steps:
310-
- uses: actions/checkout@v2
317+
- uses: actions/checkout@v3
311318

312319
- name: Install Node.js v14
313-
uses: actions/setup-node@v2
320+
uses: actions/setup-node@v3
314321
with:
315322
node-version: "14"
316323

@@ -325,7 +332,7 @@ jobs:
325332
PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
326333

327334
- name: Download npm package
328-
uses: actions/download-artifact@v2
335+
uses: actions/download-artifact@v3
329336
with:
330337
name: npm-package
331338

@@ -356,10 +363,10 @@ jobs:
356363
runs-on: macos-latest
357364
timeout-minutes: 15
358365
steps:
359-
- uses: actions/checkout@v2
366+
- uses: actions/checkout@v3
360367

361368
- name: Install Node.js v14
362-
uses: actions/setup-node@v2
369+
uses: actions/setup-node@v3
363370
with:
364371
node-version: "14"
365372

@@ -369,7 +376,7 @@ jobs:
369376
echo "$HOME/.local/bin" >> $GITHUB_PATH
370377
371378
- name: Download npm package
372-
uses: actions/download-artifact@v2
379+
uses: actions/download-artifact@v3
373380
with:
374381
name: npm-package
375382

@@ -401,10 +408,10 @@ jobs:
401408
# since VS Code will load faster due to the bundling.
402409
CODE_SERVER_TEST_ENTRY: "./release-packages/code-server-linux-amd64"
403410
steps:
404-
- uses: actions/checkout@v2
411+
- uses: actions/checkout@v3
405412

406413
- name: Install Node.js v14
407-
uses: actions/setup-node@v2
414+
uses: actions/setup-node@v3
408415
with:
409416
node-version: "14"
410417

@@ -418,7 +425,7 @@ jobs:
418425
yarn-build-
419426
420427
- name: Download release packages
421-
uses: actions/download-artifact@v2
428+
uses: actions/download-artifact@v3
422429
with:
423430
name: release-packages
424431
path: ./release-packages
@@ -455,10 +462,10 @@ jobs:
455462
runs-on: ubuntu-20.04
456463
steps:
457464
- name: Checkout code
458-
uses: actions/checkout@v2
465+
uses: actions/checkout@v3
459466
- name: Run Trivy vulnerability scanner in repo mode
460467
#Commit SHA for v0.0.17
461-
uses: aquasecurity/trivy-action@a7a829a4345428ddd92ca57b18257440f6a18c90
468+
uses: aquasecurity/trivy-action@296212627a1e693efa09c00adc3e03b2ba8edf18
462469
with:
463470
scan-type: "fs"
464471
scan-ref: "."

‎.github/workflows/codeql-analysis.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,21 @@ on:
1010
# Runs every Monday morning PST
1111
- cron: "17 15 * * 1"
1212

13+
# Cancel in-progress runs for pull requests when developers push
14+
# additional changes, and serialize builds in branches.
15+
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.ref }}
18+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
19+
1320
jobs:
1421
analyze:
1522
name: Analyze
1623
runs-on: ubuntu-20.04
1724

1825
steps:
1926
- name: Checkout repository
20-
uses: actions/checkout@v2
27+
uses: actions/checkout@v3
2128

2229
# Initializes the CodeQL tools for scanning.
2330
- name: Initialize CodeQL

‎.github/workflows/docker.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,19 @@ on:
99
types:
1010
- released
1111

12+
# Cancel in-progress runs for pull requests when developers push
13+
# additional changes, and serialize builds in branches.
14+
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.ref }}
17+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
18+
1219
jobs:
1320
docker-images:
1421
runs-on: ubuntu-20.04
1522
steps:
1623
- name: Checkout
17-
uses: actions/checkout@v2
24+
uses: actions/checkout@v3
1825

1926
- name: Set up QEMU
2027
uses: docker/setup-qemu-action@v1

‎.github/workflows/docs-preview.yaml

+9-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ permissions:
1717
security-events: none
1818
statuses: none
1919

20+
# Cancel in-progress runs for pull requests when developers push
21+
# additional changes, and serialize builds in branches.
22+
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
23+
concurrency:
24+
group: ${{ github.workflow }}-${{ github.ref }}
25+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
26+
2027
jobs:
2128
preview:
2229
name: Docs preview
@@ -30,7 +37,7 @@ jobs:
3037
uses: styfle/cancel-workflow-action@0.9.1
3138

3239
- name: Checkout m
33-
uses: actions/checkout@v2
40+
uses: actions/checkout@v3
3441
with:
3542
repository: coder/m
3643
ref: refs/heads/master
@@ -39,7 +46,7 @@ jobs:
3946
fetch-depth: 0
4047

4148
- name: Install Node.js
42-
uses: actions/setup-node@v2
49+
uses: actions/setup-node@v3
4350
with:
4451
node-version: 14
4552

‎.github/workflows/installer.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,20 @@ on:
1212
paths:
1313
- "install.sh"
1414

15+
# Cancel in-progress runs for pull requests when developers push
16+
# additional changes, and serialize builds in branches.
17+
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
21+
1522
jobs:
1623
ubuntu:
1724
name: Test installer on Ubuntu
1825
runs-on: ubuntu-latest
1926
steps:
2027
- name: Checkout repo
21-
uses: actions/checkout@v2
28+
uses: actions/checkout@v3
2229

2330
- name: Install code-server
2431
run: ./install.sh
@@ -32,7 +39,7 @@ jobs:
3239
container: "alpine:3.14"
3340
steps:
3441
- name: Checkout repo
35-
uses: actions/checkout@v2
42+
uses: actions/checkout@v3
3643

3744
- name: Install curl
3845
run: apk add curl
@@ -50,7 +57,7 @@ jobs:
5057

5158
steps:
5259
- name: Checkout repo
53-
uses: actions/checkout@v2
60+
uses: actions/checkout@v3
5461

5562
- name: Install code-server
5663
run: ./install.sh

‎.github/workflows/npm-brew.yaml

+10-3
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,22 @@ on:
88
release:
99
types: [released]
1010

11+
# Cancel in-progress runs for pull requests when developers push
12+
# additional changes, and serialize builds in branches.
13+
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.ref }}
16+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
17+
1118
jobs:
1219
# NOTE: this job requires curl, jq and yarn
1320
# All of them are included in ubuntu-latest.
1421
npm:
1522
runs-on: ubuntu-latest
1623
steps:
17-
- uses: actions/checkout@v2
24+
- uses: actions/checkout@v3
1825

19-
- uses: actions/download-artifact@v2
26+
- uses: actions/download-artifact@v3
2027
id: download
2128
with:
2229
name: "npm-package"
@@ -42,7 +49,7 @@ jobs:
4249
id: set-up-homebrew
4350
uses: Homebrew/actions/setup-homebrew@master
4451

45-
- uses: actions/checkout@v2
52+
- uses: actions/checkout@v3
4653
- name: Configure git
4754
run: |
4855
git config user.name github-actions

‎.github/workflows/scripts.yml

+20-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,25 @@ on:
1414
- "**.sh"
1515
- "**.bats"
1616

17+
permissions:
18+
actions: none
19+
checks: none
20+
contents: read
21+
deployments: none
22+
issues: none
23+
packages: none
24+
pull-requests: none
25+
repository-projects: none
26+
security-events: none
27+
statuses: none
28+
29+
# Cancel in-progress runs for pull requests when developers push
30+
# additional changes, and serialize builds in branches.
31+
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-concurrency-to-cancel-any-in-progress-job-or-run
32+
concurrency:
33+
group: ${{ github.workflow }}-${{ github.ref }}
34+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
35+
1736
jobs:
1837
test:
1938
name: Run script unit tests
@@ -22,7 +41,7 @@ jobs:
2241
container: "alpine:3.14"
2342
steps:
2443
- name: Checkout repo
25-
uses: actions/checkout@v2
44+
uses: actions/checkout@v3
2645

2746
- name: Install test utilities
2847
run: apk add bats checkbashisms

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"compression": "^1.7.4",
9090
"cookie-parser": "^1.4.5",
9191
"env-paths": "^2.2.0",
92-
"express": "^5.0.0-alpha.8",
92+
"express": "5.0.0-alpha.8",
9393
"http-proxy": "^1.18.0",
9494
"httpolyglot": "^0.1.2",
9595
"js-yaml": "^4.0.0",

0 commit comments

Comments
 (0)