Skip to content

Commit a6c4444

Browse files
committed
fixup: clean it all up
1 parent 5e06fbc commit a6c4444

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

.github/workflows/build.yaml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
run: yarn lint:ts
128128

129129
build:
130-
name: Build
130+
name: Build code-server
131131
runs-on: ubuntu-latest
132132
timeout-minutes: 30
133133
env:
@@ -223,6 +223,7 @@ jobs:
223223
path: ./package.tar.gz
224224

225225
npm:
226+
name: Publish npm package
226227
# the npm-package gets uploaded as an artifact in Build
227228
# so we need that to complete before this runs
228229
needs: build
@@ -275,15 +276,13 @@ jobs:
275276
```
276277
277278
test-e2e:
278-
name: End-to-end tests
279+
name: Run end-to-end tests
279280
needs: build
280281
runs-on: ubuntu-latest
281282
timeout-minutes: 15
282283
steps:
283284
- name: Checkout repo
284285
uses: actions/checkout@v3
285-
with:
286-
submodules: true
287286

288287
- name: Install Node.js v16
289288
uses: actions/setup-node@v3
@@ -295,9 +294,9 @@ jobs:
295294
uses: actions/cache@v3
296295
with:
297296
path: "**/node_modules"
298-
key: 1-yarn-build-${{ hashFiles('**/yarn.lock') }}
297+
key: yarn-build-${{ hashFiles('**/yarn.lock') }}
299298
restore-keys: |
300-
1-yarn-build-
299+
yarn-build-
301300
302301
- name: Download npm package
303302
uses: actions/download-artifact@v3
@@ -312,15 +311,17 @@ jobs:
312311

313312
- name: Install dependencies
314313
if: steps.cache-node-modules.outputs.cache-hit != 'true'
315-
run: yarn --frozen-lockfile
314+
run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
316315

317316
- name: Install Playwright OS dependencies
318317
run: |
319318
./test/node_modules/.bin/playwright install-deps
320319
./test/node_modules/.bin/playwright install
321320
322321
- name: Copy node binary to release
323-
run: ln -s $(which node) ./release/lib/node
322+
run: |
323+
ln -s $(which node) ./release/lib/node
324+
ln -s $(which node) ./release/node
324325
325326
- name: Run end-to-end tests
326327
run: CODE_SERVER_TEST_ENTRY=./release yarn test:e2e --global-timeout 840000
@@ -336,15 +337,13 @@ jobs:
336337
run: rm -rf ./release ./test/test-results
337338

338339
test-e2e-proxy:
339-
name: End-to-end tests behind proxy
340+
name: Run end-to-end tests behind proxy
340341
needs: build
341342
runs-on: ubuntu-latest
342343
timeout-minutes: 25
343344
steps:
344345
- name: Checkout repo
345346
uses: actions/checkout@v3
346-
with:
347-
submodules: true
348347

349348
- name: Install Node.js v16
350349
uses: actions/setup-node@v3
@@ -356,9 +355,9 @@ jobs:
356355
uses: actions/cache@v3
357356
with:
358357
path: "**/node_modules"
359-
key: 1-yarn-build-${{ hashFiles('**/yarn.lock') }}
358+
key: yarn-build-${{ hashFiles('**/yarn.lock') }}
360359
restore-keys: |
361-
1-yarn-build-
360+
yarn-build-
362361
363362
- name: Download npm package
364363
uses: actions/download-artifact@v3
@@ -373,7 +372,7 @@ jobs:
373372

374373
- name: Install dependencies
375374
if: steps.cache-node-modules.outputs.cache-hit != 'true'
376-
run: yarn --frozen-lockfile
375+
run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
377376

378377
- name: Install Playwright OS dependencies
379378
run: |

0 commit comments

Comments
 (0)