Skip to content

Commit 0d7fb55

Browse files
authored
Merge branch 'main' into patch-2
2 parents a5e97ac + b621911 commit 0d7fb55

35 files changed

+289
-50
lines changed

.github/semantic.yaml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
###############################################################################
2+
# This file configures "Semantic Pull Requests", which is documented here:
3+
# https://github.com/zeke/semantic-pull-requests
4+
###############################################################################
5+
6+
# Scopes are optionally supplied after a 'type'. For example, in
7+
#
8+
# feat(docs): autostart ui
9+
#
10+
# '(docs)' is the scope. Scopes are used to signify where the change occurred.
11+
scopes:
12+
# docs: changes to the code-server documentation.
13+
- docs
14+
15+
# vendor: changes to vendored dependencies.
16+
- vendor
17+
18+
# deps: changes to code-server's dependencies.
19+
- deps
20+
21+
# cs: changes to code specific to code-server.
22+
- cs
23+
24+
# cli: changes to the command-line interface.
25+
- cli
26+
27+
# We only check that the PR title is semantic. The PR title is automatically
28+
# applied to the "Squash & Merge" flow as the suggested commit message, so this
29+
# should suffice unless someone drastically alters the message in that flow.
30+
titleOnly: true
31+
32+
# Types are the 'tag' types in a commit or PR title. For example, in
33+
#
34+
# chore: fix thing
35+
#
36+
# 'chore' is the type.
37+
types:
38+
# A build of any kind.
39+
- build
40+
41+
# A user-facing change that corrects a defect in code-server.
42+
- fix
43+
44+
# Any code task that is ignored for changelog purposes. Examples include
45+
# devbin scripts and internal-only configurations.
46+
- chore
47+
48+
# Any work performed on CI.
49+
- ci
50+
51+
# Work that directly implements or supports the implementation of a feature.
52+
- feat
53+
54+
# A refactor changes code structure without any behavioral change.
55+
- refactor
56+
57+
# A git revert for any style of commit.
58+
- revert
59+
60+
# Adding tests of any kind. Should be separate from feature or fix
61+
# implementations. For example, if a commit adds a fix + test, it's a fix
62+
# commit. If a commit is simply bumping coverage, it's a test commit.
63+
- test

CHANGELOG.md

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ VS Code v99.99.999
2222

2323
## [Unreleased](https://github.com/cdr/code-server/releases)
2424

25+
VS Code v0.00.0
26+
27+
### Changed
28+
29+
- Add here
30+
31+
## [4.0.1](https://github.com/cdr/code-server/releases/tag/v4.0.1) - 2022-01-04
32+
2533
VS Code v1.63.0
2634

2735
code-server has been rebased on upstream's newly open-sourced server
@@ -31,15 +39,24 @@ implementation (#4414).
3139

3240
- Web socket compression has been made the default (when supported). This means
3341
the `--enable` flag will no longer take `permessage-deflate` as an option.
34-
- Extra extension directories have been removed. The `--extra-extensions-dir`
35-
and `--extra-builtin-extensions-dir` will no longer be accepted.
36-
- The `--install-source` and `--locale` flags have been removed.
3742
- The static endpoint can no longer reach outside code-server. However the
3843
vscode-remote-resource endpoint still can.
39-
- OpenVSX has been made the default marketplace. However this means web
40-
extensions like Vim may be broken.
44+
- OpenVSX has been made the default marketplace.
4145
- The last opened folder/workspace is no longer stored separately in the
4246
settings file (we rely on the already-existing query object instead).
47+
- The marketplace override environment variables `SERVICE_URL` and `ITEM_URL`
48+
have been replaced with a single `EXTENSIONS_GALLERY` variable that
49+
corresponds to `extensionsGallery` in VS Code's `product.json`.
50+
51+
### Added
52+
53+
- `VSCODE_PROXY_URI` env var for use in the terminal and extensions.
54+
55+
### Removed
56+
57+
- Extra extension directories have been removed. The `--extra-extensions-dir`
58+
and `--extra-builtin-extensions-dir` flags will no longer be accepted.
59+
- The `--install-source` flag has been removed.
4360

4461
### Deprecated
4562

ci/build/release-prep.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ main() {
8383
echo -e "Great! We'll prep a PR for updating to $CODE_SERVER_VERSION_TO_UPDATE\n"
8484
$CMD rg -g '!yarn.lock' -g '!*.svg' -g '!CHANGELOG.md' --files-with-matches --fixed-strings "${CODE_SERVER_CURRENT_VERSION}" | $CMD xargs sd "$CODE_SERVER_CURRENT_VERSION" "$CODE_SERVER_VERSION_TO_UPDATE"
8585

86-
$CMD git commit -am "chore(release): bump version to $CODE_SERVER_VERSION_TO_UPDATE"
86+
$CMD git commit --no-verify -am "chore(release): bump version to $CODE_SERVER_VERSION_TO_UPDATE"
8787

8888
# This runs from the root so that's why we use this path vs. ../../
8989
RELEASE_TEMPLATE_STRING=$(cat ./.github/PULL_REQUEST_TEMPLATE/release_template.md)

ci/dev/postinstall.sh

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,30 @@ set -euo pipefail
33

44
main() {
55
cd "$(dirname "$0")/../.."
6+
source ./ci/lib.sh
67

7-
echo "Installing code-server test dependencies..."
8+
pushd test
9+
echo "Installing dependencies for $PWD"
10+
yarn install
11+
popd
812

913
local args=(install)
1014
if [[ ${CI-} ]]; then
1115
args+=(--frozen-lockfile)
1216
fi
1317

14-
cd test
18+
pushd test
19+
echo "Installing dependencies for $PWD"
1520
yarn "${args[@]}"
16-
cd ..
21+
popd
1722

18-
cd vendor
19-
echo "Installing vendor dependencies..."
23+
pushd test/e2e/extensions/test-extension
24+
echo "Installing dependencies for $PWD"
25+
yarn "${args[@]}"
26+
popd
27+
28+
pushd vendor
29+
echo "Installing dependencies for $PWD"
2030

2131
# We install in 'modules' instead of 'node_modules' because VS Code's
2232
# extensions use a webpack config which cannot differentiate between its own
@@ -33,6 +43,8 @@ main() {
3343

3444
# Finally, run the vendor `postinstall`
3545
yarn run postinstall
46+
47+
popd
3648
}
3749

3850
main "$@"

ci/dev/test-e2e.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ main() {
1313

1414
source ./ci/lib.sh
1515

16+
pushd test/e2e/extensions/test-extension
17+
echo "Building test extension"
18+
yarn build
19+
popd
20+
1621
local dir="$PWD"
1722
if [[ ! ${CODE_SERVER_TEST_ENTRY-} ]]; then
1823
echo "Set CODE_SERVER_TEST_ENTRY to test another build of code-server"

ci/dev/test-unit.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ main() {
66

77
source ./ci/lib.sh
88

9+
echo "Building test plugin"
910
pushd test/unit/node/test-plugin
1011
make -s out/index.js
1112
popd

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: 1.0.5
18+
version: 2.0.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.0.0
23+
appVersion: 4.0.1

ci/helm-chart/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replicaCount: 1
66

77
image:
88
repository: codercom/code-server
9-
tag: '4.0.0'
9+
tag: '4.0.1'
1010
pullPolicy: Always
1111

1212
imagePullSecrets: []

ci/steps/brew-bump.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ main() {
1010
echo "Checking environment variables"
1111

1212
# We need VERSION to bump the brew formula
13-
if is_env_var_set "VERSION"; then
13+
if ! is_env_var_set "VERSION"; then
1414
echo "VERSION is not set"
1515
exit 1
1616
fi
1717

1818
# We need HOMEBREW_GITHUB_API_TOKEN to push up commits
19-
if is_env_var_set "HOMEBREW_GITHUB_API_TOKEN"; then
19+
if ! is_env_var_set "HOMEBREW_GITHUB_API_TOKEN"; then
2020
echo "HOMEBREW_GITHUB_API_TOKEN is not set"
2121
exit 1
2222
fi

docs/MAINTAINING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Current maintainers:
3737
- @TeffenEllis
3838
- @jsjoeio
3939

40-
Occassionally, other Coder employees may step in time to time to assist with code-server.
40+
Occasionally, other Coder employees may step in time to time to assist with code-server.
4141

4242
### Onboarding
4343

@@ -202,7 +202,7 @@ This is currently automated with the release process.
202202

203203
We publish code-server on Homebrew [here](https://github.com/Homebrew/homebrew-core/blob/master/Formula/code-server.rb).
204204

205-
This is currently automated with the release process (but may fail occassionally). If it does, run this locally:
205+
This is currently automated with the release process (but may fail occasionally). If it does, run this locally:
206206

207207
```shell
208208
# Replace VERSION with version
@@ -231,7 +231,7 @@ Ideally, our fork stays as close to upstream as possible. See the differences be
231231

232232
Our testing structure is laid out under our [Contributing docs](https://coder.com/docs/code-server/latest/CONTRIBUTING#test).
233233

234-
We hope to eventually hit 100% test converage with our unit tests, and maybe one day our scripts (coverage not tracked currently).
234+
We hope to eventually hit 100% test coverage with our unit tests, and maybe one day our scripts (coverage not tracked currently).
235235

236236
If you're ever looking to add more tests, here are a few ways to get started:
237237

0 commit comments

Comments
 (0)