Skip to content

Commit 5958100

Browse files
authored
Merge branch 'main' into release/v4.9.1
2 parents 2217e2f + fa39d47 commit 5958100

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed

.github/workflows/release.yaml

+3-23
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,12 @@ jobs:
6767
- name: Decompress npm package
6868
run: tar -xzf package.tar.gz
6969

70-
- name: Fetch dependencies from cache
71-
id: cache-node-modules
72-
uses: actions/cache@v3
73-
with:
74-
path: "**/node_modules"
75-
key: yarn-build-linux-amd64-${{ hashFiles('**/yarn.lock') }}
76-
restore-keys: |
77-
yarn-build-linux-amd64-
78-
7970
# NOTE: && here is deliberate - GitHub puts each line in its own `.sh`
8071
# file when running inside a docker container.
8172
- name: Build standalone release
8273
run: source scl_source enable devtoolset-9 && npm run release:standalone
8374

8475
- name: Install test dependencies
85-
if: steps.cache-node-modules.outputs.cache-hit != 'true'
8676
run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
8777

8878
- name: Run integration tests on standalone release
@@ -129,11 +119,11 @@ jobs:
129119
# but this means we don't need to maintain a self-hosted runner!
130120

131121
# NOTE@jsjoeio:
132-
# We used to use 16.04 until GitHub deprecated it on September 20, 2021
133-
# See here: https://github.com/actions/virtual-environments/pull/3862/files
122+
# We used to use 18.04 until GitHub browned it out on December 15, 2022
123+
# See here: https://github.com/actions/runner-images/issues/6002
134124
package-linux-cross:
135125
name: Linux cross-compile builds
136-
runs-on: ubuntu-18.04
126+
runs-on: ubuntu-20.04
137127
timeout-minutes: 15
138128
needs: npm-version
139129
strategy:
@@ -237,20 +227,10 @@ jobs:
237227
- name: Decompress npm package
238228
run: tar -xzf package.tar.gz
239229

240-
- name: Fetch dependencies from cache
241-
id: cache-node-modules
242-
uses: actions/cache@v3
243-
with:
244-
path: "**/node_modules"
245-
key: yarn-build-macos-${{ hashFiles('**/yarn.lock') }}
246-
restore-keys: |
247-
yarn-build-macos-
248-
249230
- name: Build standalone release
250231
run: npm run release:standalone
251232

252233
- name: Install test dependencies
253-
if: steps.cache-node-modules.outputs.cache-hit != 'true'
254234
run: SKIP_SUBMODULE_DEPS=1 yarn install
255235

256236
- name: Run native module tests on standalone release

ci/build/nfpm.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ contents:
2222
dst: /usr/lib/systemd/user/code-server.service
2323

2424
- src: ./release-standalone/*
25-
dst: /usr/lib/code-server/
25+
dst: /usr/lib/code-server

0 commit comments

Comments
 (0)