Skip to content

Commit 1e08d8f

Browse files
Merge branch 'coder:main' into main
2 parents 6d45c79 + 461d4cb commit 1e08d8f

Some content is hidden

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

63 files changed

+735
-861
lines changed

.github/ranger.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/build.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
8484
- name: Install helm
8585
if: steps.changed-files.outputs.any_changed == 'true'
86-
uses: azure/setup-helm@v3.5
86+
uses: azure/setup-helm@v4
8787
with:
8888
token: ${{ secrets.GITHUB_TOKEN }}
8989

@@ -147,7 +147,7 @@ jobs:
147147
uses: actions/checkout@v4
148148
- name: Check workflow files
149149
run: |
150-
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/7fdc9630cc360ea1a469eed64ac6d78caeda1234/scripts/download-actionlint.bash)
150+
bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.7.1
151151
./actionlint -color -shellcheck= -ignore "set-output"
152152
shell: bash
153153

@@ -206,6 +206,7 @@ jobs:
206206
timeout-minutes: 60
207207
env:
208208
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
209+
DISABLE_V8_COMPILE_CACHE: 1
209210
steps:
210211
- name: Checkout repo
211212
uses: actions/checkout@v4
@@ -229,11 +230,6 @@ jobs:
229230
with:
230231
node-version-file: .node-version
231232

232-
# node-gyp is missing in (at least) npm 9.8.1.
233-
# TODO: Remove once we update to npm>=10?
234-
- name: Install node-gyp
235-
run: npm install -g node-gyp
236-
237233
- name: Fetch dependencies from cache
238234
id: cache-node-modules
239235
uses: actions/cache@v4

.github/workflows/publish.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
cache: "yarn"
3737

3838
- name: Download npm package from release artifacts
39-
uses: robinraju/release-downloader@v1.9
39+
uses: robinraju/release-downloader@v1.11
4040
with:
4141
repository: "coder/code-server"
4242
tag: ${{ github.event.inputs.version || github.ref_name }}
@@ -184,15 +184,15 @@ jobs:
184184
echo "VERSION=${TAG#v}" >> $GITHUB_ENV
185185
186186
- name: Download deb artifacts
187-
uses: robinraju/release-downloader@v1.9
187+
uses: robinraju/release-downloader@v1.11
188188
with:
189189
repository: "coder/code-server"
190190
tag: v${{ env.VERSION }}
191191
fileName: "*.deb"
192192
out-file-path: "release-packages"
193193

194194
- name: Download rpm artifacts
195-
uses: robinraju/release-downloader@v1.9
195+
uses: robinraju/release-downloader@v1.11
196196
with:
197197
repository: "coder/code-server"
198198
tag: v${{ env.VERSION }}

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ jobs:
222222
# next update Node we can probably remove this. For now, install
223223
# setuptools since it contains distutils.
224224
- name: Install Python utilities
225-
run: python3 -m pip install setuptools
225+
run: brew install python-setuptools
226226

227227
- name: Download npm package
228228
uses: actions/download-artifact@v4
@@ -282,7 +282,7 @@ jobs:
282282
timeout-minutes: 15
283283
steps:
284284
- name: Download artifacts
285-
uses: dawidd6/action-download-artifact@v3
285+
uses: dawidd6/action-download-artifact@v6
286286
id: download
287287
with:
288288
branch: ${{ github.ref }}

.github/workflows/security.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
2020

2121
jobs:
22-
audit-ci:
22+
audit:
2323
name: Audit node modules
2424
runs-on: ubuntu-latest
2525
timeout-minutes: 15
@@ -55,7 +55,7 @@ jobs:
5555
fetch-depth: 0
5656

5757
- name: Run Trivy vulnerability scanner in repo mode
58-
uses: aquasecurity/trivy-action@d710430a6722f083d3b36b8339ff66b32f22ee55
58+
uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8
5959
with:
6060
scan-type: "fs"
6161
scan-ref: "."

.github/workflows/trivy-docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
uses: actions/checkout@v4
5252

5353
- name: Run Trivy vulnerability scanner in image mode
54-
uses: aquasecurity/trivy-action@d710430a6722f083d3b36b8339ff66b32f22ee55
54+
uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8
5555
with:
5656
image-ref: "docker.io/codercom/code-server:latest"
5757
ignore-unfixed: true

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.18.2
1+
20.11.1

CHANGELOG.md

Lines changed: 88 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,101 @@ Code v99.99.999
2222

2323
## Unreleased
2424

25+
## [4.91.0](https://github.com/coder/code-server/releases/tag/v4.91.0) - 2024-07-10
26+
27+
Code v1.91.0
28+
29+
### Changed
30+
31+
- Updated to Code 1.91.0.
32+
33+
## [4.90.3](https://github.com/coder/code-server/releases/tag/v4.90.3) - 2024-06-21
34+
35+
Code v1.90.2
36+
37+
### Changed
38+
39+
- Updated to Code 1.90.2.
40+
41+
### Fixed
42+
43+
- When the log gets rotated it will no longer incorrectly be moved to a new
44+
directory created in the current working directory named with a date.
45+
Instead, the file itself is prepended with the date and kept in the same
46+
directory, as originally intended.
47+
48+
## [4.90.2](https://github.com/coder/code-server/releases/tag/v4.90.2) - 2024-06-14
49+
50+
Code v1.90.1
51+
52+
### Changed
53+
54+
- Updated to Code 1.90.1.
55+
56+
## [4.90.1](https://github.com/coder/code-server/releases/tag/v4.90.1) - 2024-06-12
57+
58+
Code v1.90.0
59+
60+
### Fixed
61+
62+
- Cache a call to get CPU information used in telemetry that could result in a
63+
lack responsiveness if it was particularly slow.
64+
65+
## [4.90.0](https://github.com/coder/code-server/releases/tag/v4.90.0) - 2024-06-11
66+
67+
Code v1.90.0
68+
69+
### Changed
70+
71+
- Updated to Code 1.90.0.
72+
- Updated Node to 20.11.1.
73+
74+
### Added
75+
76+
- Send contents to the clipboard in the integrated terminal by piping to
77+
`code-server --stdin-to-clipboard` or `code-server -c`.
78+
79+
You may want to make this an alias:
80+
81+
```
82+
alias xclip="code-server --stdin-to-clipboard"
83+
echo -n "hello world" | xclip
84+
```
85+
86+
## [4.89.1](https://github.com/coder/code-server/releases/tag/v4.89.1) - 2024-04-14
87+
88+
Code v1.89.1
89+
90+
### Changed
91+
92+
- Updated to Code 1.89.1.
93+
94+
## [4.89.0](https://github.com/coder/code-server/releases/tag/v4.89.0) - 2024-04-08
95+
96+
Code v1.89.0
97+
98+
### Changed
99+
100+
- Updated to Code 1.89.0.
101+
25102
## [4.23.1](https://github.com/coder/code-server/releases/tag/v4.23.1) - 2024-04-15
26103

27104
Code v1.88.1
28105

29-
## Changed
106+
### Changed
30107

31108
- Updated to Code 1.88.1.
32109

33110
## [4.23.0](https://github.com/coder/code-server/releases/tag/v4.23.0) - 2024-04-08
34111

35112
Code v1.88.0
36113

37-
## Changed
114+
### Changed
38115

39116
- Updated to Code 1.88.0.
40117
- Updated Node to 18.18.2.
41118

42-
## Fixed
119+
### Fixed
43120

44121
- Fix masking the exit code when failing to install extensions on the command
45122
line outside the integrated terminal. Installing extensions inside the
@@ -49,7 +126,7 @@ Code v1.88.0
49126

50127
Code v1.87.2
51128

52-
## Changed
129+
### Changed
53130

54131
- Updated to Code 1.87.2.
55132
- Enable keep-alive for proxy agent.
@@ -58,48 +135,48 @@ Code v1.87.2
58135

59136
Code v1.87.0
60137

61-
## Changed
138+
### Changed
62139

63140
- Updated to Code 1.87.0.
64141

65142
## [4.21.2](https://github.com/coder/code-server/releases/tag/v4.21.2) - 2024-02-28
66143

67144
Code v1.86.2
68145

69-
## Changed
146+
### Changed
70147

71148
- Updated to Code 1.86.2.
72149

73150
## [4.21.1](https://github.com/coder/code-server/releases/tag/v4.21.1) - 2024-02-09
74151

75152
Code v1.86.1
76153

77-
## Changed
154+
### Changed
78155

79156
- Updated to Code 1.86.1.
80157
- Updated to Node 18.17.1.
81158

82-
## Added
159+
### Added
83160

84161
- Docker images for Fedora and openSUSE.
85162

86163
## [4.21.0](https://github.com/coder/code-server/releases/tag/v4.21.0) - 2024-02-05
87164

88165
Code v1.86.0
89166

90-
## Changed
167+
### Changed
91168

92169
- Updated to Code 1.86.0.
93170

94171
## [4.20.1](https://github.com/coder/code-server/releases/tag/v4.20.1) - 2024-01-22
95172

96173
Code v1.85.2
97174

98-
## Changed
175+
### Changed
99176

100177
- Updated to Code 1.85.2.
101178

102-
## Fixed
179+
### Fixed
103180

104181
- Query variables are no longer double-encoded when going over the path proxy.
105182

ci/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ This directory contains scripts used for the development of code-server.
2424
- Runs unit tests.
2525
- [./ci/dev/test-e2e.sh](./dev/test-e2e.sh) (`yarn test:e2e`)
2626
- Runs end-to-end tests.
27-
- [./ci/dev/ci.sh](./dev/ci.sh) (`yarn ci`)
28-
- Runs `yarn fmt`, `yarn lint` and `yarn test`.
2927
- [./ci/dev/watch.ts](./dev/watch.ts) (`yarn watch`)
3028
- Starts a process to build and launch code-server and restart on any code changes.
3129
- Example usage in [./docs/CONTRIBUTING.md](../docs/CONTRIBUTING.md).

ci/build/build-packages.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ release_nfpm() {
5050

5151
export NFPM_ARCH
5252

53-
# Code deletes some files from the extension node_modules directory which
54-
# leaves broken symlinks in the corresponding .bin directory. nfpm will fail
55-
# on these broken symlinks so clean them up.
56-
rm -fr "./release-standalone/lib/vscode/extensions/node_modules/.bin"
57-
5853
PKG_FORMAT="deb"
5954
NFPM_ARCH="$(get_nfpm_arch $PKG_FORMAT "$ARCH")"
6055
nfpm_config="$(envsubst < ./ci/build/nfpm.yaml)"

ci/build/build-standalone-release.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ main() {
2424

2525
pushd "$RELEASE_PATH"
2626
npm install --unsafe-perm --omit=dev
27+
# Code deletes some files from the extension node_modules directory which
28+
# leaves broken symlinks in the corresponding .bin directory. nfpm will fail
29+
# on these broken symlinks so clean them up.
30+
rm -fr "./lib/vscode/extensions/node_modules/.bin"
2731
popd
2832
}
2933

ci/build/npm-postinstall.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ main() {
7676
echo "USE AT YOUR OWN RISK!"
7777
fi
7878

79-
if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-18}" ]; then
80-
echo "ERROR: code-server currently requires node v18."
79+
if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-20}" ]; then
80+
echo "ERROR: code-server currently requires node v20."
8181
if [ -n "$FORCE_NODE_VERSION" ]; then
8282
echo "However, you have overrided the version check to use v$FORCE_NODE_VERSION."
8383
fi

ci/dev/audit.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

ci/dev/ci.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

ci/helm-chart/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 3.19.1
18+
version: 3.22.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
23-
appVersion: 4.23.1
23+
appVersion: 4.91.0

0 commit comments

Comments
 (0)