Skip to content

Commit 2583a95

Browse files
authored
Merge branch 'main' into helm-priorityClassName
2 parents 978bc00 + a879844 commit 2583a95

33 files changed

+588
-482
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,13 @@ body:
6666
required: false
6767
- type: checkboxes
6868
attributes:
69-
label: Does this issue happen in VS Code?
70-
description: Please try reproducing this issue in VS Code
69+
label: Does this issue happen in VS Code or GitHub Codespaces?
70+
description: Please try reproducing this issue in VS Code or GitHub Codespaces
7171
options:
7272
- label: I cannot reproduce this in VS Code.
7373
required: true
74+
- label: I cannot reproduce this in GitHub Codespaces.
75+
required: true
7476
- type: checkboxes
7577
attributes:
7678
label: Are you accessing code-server over HTTPS?

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ jobs:
509509
fetch-depth: 0
510510

511511
- name: Run Trivy vulnerability scanner in repo mode
512-
uses: aquasecurity/trivy-action@df3fb7d00b594d641478ba45b867f5cbb32108be
512+
uses: aquasecurity/trivy-action@7b7aa264d83dc58691451798b4d117d53d21edfe
513513
with:
514514
scan-type: "fs"
515515
scan-ref: "."

.github/workflows/docker.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ jobs:
4747
run: echo "::set-output name=version::$(jq -r .version package.json)"
4848

4949
- name: Download release artifacts
50-
uses: robinraju/release-downloader@v1.3
50+
uses: robinraju/release-downloader@v1.4
5151
with:
5252
repository: "coder/code-server"
5353
tag: v${{ steps.version.outputs.version }}
54-
fileName: "*"
54+
fileName: "*.deb"
5555
out-file-path: "release-packages"
5656

5757
- name: Publish to Docker

.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@v3
5252

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

ci/build/build-release.sh

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -98,43 +98,6 @@ bundle_vscode() {
9898

9999
rsync "${rsync_opts[@]}" ./lib/vscode-reh-web-*/ "$VSCODE_OUT_PATH"
100100

101-
# Add the commit, date, our name, links, and enable telemetry. This just makes
102-
# telemetry available; telemetry can still be disabled by flag or setting.
103-
jq --slurp '.[0] * .[1]' "$VSCODE_SRC_PATH/product.json" <(
104-
cat << EOF
105-
{
106-
"enableTelemetry": true,
107-
"commit": "$(cd "$VSCODE_SRC_PATH" && git rev-parse HEAD)",
108-
"quality": "stable",
109-
"date": $(jq -n 'now | todate'),
110-
"codeServerVersion": "$VERSION",
111-
"nameShort": "code-server",
112-
"nameLong": "code-server",
113-
"applicationName": "code-server",
114-
"dataFolderName": ".code-server",
115-
"win32MutexName": "codeserver",
116-
"licenseUrl": "https://github.com/coder/code-server/blob/main/LICENSE",
117-
"win32DirName": "code-server",
118-
"win32NameVersion": "code-server",
119-
"win32AppUserModelId": "coder.code-server",
120-
"win32ShellNameShort": "c&ode-server",
121-
"darwinBundleIdentifier": "com.coder.code.server",
122-
"linuxIconName": "com.coder.code.server",
123-
"reportIssueUrl": "https://github.com/coder/code-server/issues/new",
124-
"documentationUrl": "https://go.microsoft.com/fwlink/?LinkID=533484#vscode",
125-
"keyboardShortcutsUrlMac": "https://go.microsoft.com/fwlink/?linkid=832143",
126-
"keyboardShortcutsUrlLinux": "https://go.microsoft.com/fwlink/?linkid=832144",
127-
"keyboardShortcutsUrlWin": "https://go.microsoft.com/fwlink/?linkid=832145",
128-
"introductoryVideosUrl": "https://go.microsoft.com/fwlink/?linkid=832146",
129-
"tipsAndTricksUrl": "https://go.microsoft.com/fwlink/?linkid=852118",
130-
"newsletterSignupUrl": "https://www.research.net/r/vsc-newsletter",
131-
"linkProtectionTrustedDomains": [
132-
"https://open-vsx.org"
133-
]
134-
}
135-
EOF
136-
) > "$VSCODE_OUT_PATH/product.json"
137-
138101
# Use the package.json for the web/remote server. It does not have the right
139102
# version though so pull that from the main package.json.
140103
jq --slurp '.[0] * {version: .[1].version}' \

ci/build/build-vscode.sh

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,62 @@ MINIFY=${MINIFY-true}
99
main() {
1010
cd "$(dirname "${0}")/../.."
1111

12+
source ./ci/lib.sh
13+
1214
cd lib/vscode
1315

16+
# Set the commit Code will embed into the product.json. We need to do this
17+
# since Code tries to get the commit from the `.git` directory which will fail
18+
# as it is a submodule.
19+
export VSCODE_DISTRO_COMMIT
20+
VSCODE_DISTRO_COMMIT=$(git rev-parse HEAD)
21+
22+
# Add the date, our name, links, and enable telemetry (this just makes
23+
# telemetry available; telemetry can still be disabled by flag or setting).
24+
# This needs to be done before building as Code will read this file and embed
25+
# it into the client-side code.
26+
git checkout product.json # Reset in case the script exited early.
27+
cp product.json product.original.json # Since jq has no inline edit.
28+
jq --slurp '.[0] * .[1]' product.original.json <(
29+
cat << EOF
30+
{
31+
"enableTelemetry": true,
32+
"quality": "stable",
33+
"codeServerVersion": "$VERSION",
34+
"nameShort": "code-server",
35+
"nameLong": "code-server",
36+
"applicationName": "code-server",
37+
"dataFolderName": ".code-server",
38+
"win32MutexName": "codeserver",
39+
"licenseUrl": "https://github.com/coder/code-server/blob/main/LICENSE",
40+
"win32DirName": "code-server",
41+
"win32NameVersion": "code-server",
42+
"win32AppUserModelId": "coder.code-server",
43+
"win32ShellNameShort": "c&ode-server",
44+
"darwinBundleIdentifier": "com.coder.code.server",
45+
"linuxIconName": "com.coder.code.server",
46+
"reportIssueUrl": "https://github.com/coder/code-server/issues/new",
47+
"documentationUrl": "https://go.microsoft.com/fwlink/?LinkID=533484#vscode",
48+
"keyboardShortcutsUrlMac": "https://go.microsoft.com/fwlink/?linkid=832143",
49+
"keyboardShortcutsUrlLinux": "https://go.microsoft.com/fwlink/?linkid=832144",
50+
"keyboardShortcutsUrlWin": "https://go.microsoft.com/fwlink/?linkid=832145",
51+
"introductoryVideosUrl": "https://go.microsoft.com/fwlink/?linkid=832146",
52+
"tipsAndTricksUrl": "https://go.microsoft.com/fwlink/?linkid=852118",
53+
"newsletterSignupUrl": "https://www.research.net/r/vsc-newsletter",
54+
"linkProtectionTrustedDomains": [
55+
"https://open-vsx.org"
56+
]
57+
}
58+
EOF
59+
) > product.json
60+
1461
# Any platform works since we have our own packaging step (for now).
1562
yarn gulp "vscode-reh-web-linux-x64${MINIFY:+-min}"
63+
64+
# Reset so if you develop after building you will not be stuck with the wrong
65+
# commit (the dev client will use `oss-dev` but the dev server will still use
66+
# product.json which will have `stable-$commit`).
67+
git checkout product.json
1668
}
1769

1870
main "$@"

docs/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ access it in the browser.
1414
- Preserve battery life when you're on the go; all intensive tasks run on your
1515
server
1616

17-
| 🔔 code-server is a free browser-based IDE while [Coder](https://coder.com/) is our enterprise developer workspace platform. For more information, visit [Coder.com](https://coder.com/docs/comparison)
18-
| ---
17+
> **Note**
18+
> To manage multiple IDEs, workspaces, and teams, see
19+
> our new project: [coder/coder](http://cdr.co/coder-github)
1920
2021
## Requirements
2122

lib/vscode

Submodule vscode updated 1890 files

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
"limiter": "^1.1.5",
101101
"pem": "^1.14.2",
102102
"proxy-agent": "^5.0.0",
103-
"qs": "6.10.3",
103+
"qs": "6.10.5",
104104
"rotating-file-stream": "^3.0.0",
105105
"safe-buffer": "^5.1.1",
106106
"safe-compare": "^1.1.4",

0 commit comments

Comments
 (0)