Skip to content

Commit c44b961

Browse files
jsjoeiojsjoeio
authored
Merge branch 'main' into jsjoeio-fix-npm-workflows
2 parents 0dc88c8 + 79412eb commit c44b961

32 files changed

+96
-96
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# NOTE@jsjoeio
3535
# disabling this until we can audit the build process
3636
# and the usefulness of this step
37-
# See: https://github.com/cdr/code-server/issues/4287
37+
# See: https://github.com/coder/code-server/issues/4287
3838
# - name: Fetch dependencies from cache
3939
# id: cache-yarn
4040
# uses: actions/cache@v2
@@ -455,7 +455,7 @@ jobs:
455455
uses: actions/checkout@v2
456456
- name: Run Trivy vulnerability scanner in repo mode
457457
#Commit SHA for v0.0.17
458-
uses: aquasecurity/trivy-action@9c21d3ca2c14eb35419e2a8b66d1195946d579b8
458+
uses: aquasecurity/trivy-action@a7a829a4345428ddd92ca57b18257440f6a18c90
459459
with:
460460
scan-type: "fs"
461461
scan-ref: "."

‎.tours/contributing.tour‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
{
5151
"file": "src/node/heart.ts",
5252
"line": 7,
53-
"description": "code-server's heart beats to indicate recent activity.\n\nAlso documented here: [https://github.com/cdr/code-server/blob/master/docs/FAQ.md#heartbeat-file](https://github.com/cdr/code-server/blob/master/docs/FAQ.md#heartbeat-file)"
53+
"description": "code-server's heart beats to indicate recent activity.\n\nAlso documented here: [https://github.com/coder/code-server/blob/master/docs/FAQ.md#heartbeat-file](https://github.com/coder/code-server/blob/master/docs/FAQ.md#heartbeat-file)"
5454
},
5555
{
5656
"file": "src/node/socket.ts",
@@ -80,12 +80,12 @@
8080
{
8181
"file": "src/node/routes/domainProxy.ts",
8282
"line": 18,
83-
"description": "code-server provides a built-in proxy to help in developing web-based applications. This is the code for the domain-based proxy.\n\nAlso documented here: [https://github.com/cdr/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services](https://github.com/cdr/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services)"
83+
"description": "code-server provides a built-in proxy to help in developing web-based applications. This is the code for the domain-based proxy.\n\nAlso documented here: [https://github.com/coder/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services](https://github.com/coder/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services)"
8484
},
8585
{
8686
"file": "src/node/routes/pathProxy.ts",
8787
"line": 19,
88-
"description": "Here is the path-based version of the proxy.\n\nAlso documented here: [https://github.com/cdr/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services](https://github.com/cdr/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services)"
88+
"description": "Here is the path-based version of the proxy.\n\nAlso documented here: [https://github.com/coder/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services](https://github.com/coder/code-server/blob/master/docs/FAQ.md#how-do-i-securely-access-web-services)"
8989
},
9090
{
9191
"file": "src/node/proxy.ts",
@@ -95,7 +95,7 @@
9595
{
9696
"file": "src/node/routes/health.ts",
9797
"line": 5,
98-
"description": "A simple endpoint that lets you see if code-server is up.\n\nAlso documented here: [https://github.com/cdr/code-server/blob/master/docs/FAQ.md#healthz-endpoint](https://github.com/cdr/code-server/blob/master/docs/FAQ.md#healthz-endpoint)"
98+
"description": "A simple endpoint that lets you see if code-server is up.\n\nAlso documented here: [https://github.com/coder/code-server/blob/master/docs/FAQ.md#healthz-endpoint](https://github.com/coder/code-server/blob/master/docs/FAQ.md#healthz-endpoint)"
9999
},
100100
{
101101
"file": "src/node/routes/login.ts",
@@ -145,7 +145,7 @@
145145
{
146146
"directory": "vendor/modules/code-oss-dev",
147147
"line": 1,
148-
"description": "code-server makes use of VS Code's frontend web/remote support. Most of the modifications implement the remote server since that portion of the code is closed source and not released with VS Code.\n\nWe also have a few bug fixes and have added some features (like client-side extensions). See [https://github.com/cdr/code-server/blob/master/docs/CONTRIBUTING.md#modifications-to-vs-code](https://github.com/cdr/code-server/blob/master/docs/CONTRIBUTING.md#modifications-to-vs-code) for a list.\n\nWe make an effort to keep the modifications as few as possible."
148+
"description": "code-server makes use of VS Code's frontend web/remote support. Most of the modifications implement the remote server since that portion of the code is closed source and not released with VS Code.\n\nWe also have a few bug fixes and have added some features (like client-side extensions). See [https://github.com/coder/code-server/blob/master/docs/CONTRIBUTING.md#modifications-to-vs-code](https://github.com/coder/code-server/blob/master/docs/CONTRIBUTING.md#modifications-to-vs-code) for a list.\n\nWe make an effort to keep the modifications as few as possible."
149149
}
150150
]
151151
}

‎.tours/start-development.tour‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{
2121
"file": "src/node/app.ts",
2222
"line": 62,
23-
"description": "## That's it!\n\n\nThat's all there is to it! When this tour ends, your terminal session may stop, but just use `yarn watch` to start developing from here on out!\n\n\nIf you haven't already, be sure to check out these resources:\n- [Tour: Contributing](command:codetour.startTourByTitle?[\"Contributing\")\n- [Docs: FAQ.md](https://github.com/cdr/code-server/blob/master/docs/FAQ.md)\n- [Docs: CONTRIBUTING.md](https://github.com/cdr/code-server/blob/master/docs/CONTRIBUTING.md)\n- [Community: GitHub Discussions](https://github.com/cdr/code-server/discussions)\n- [Community: Slack](https://community.coder.com)"
23+
"description": "## That's it!\n\n\nThat's all there is to it! When this tour ends, your terminal session may stop, but just use `yarn watch` to start developing from here on out!\n\n\nIf you haven't already, be sure to check out these resources:\n- [Tour: Contributing](command:codetour.startTourByTitle?[\"Contributing\")\n- [Docs: FAQ.md](https://github.com/coder/code-server/blob/master/docs/FAQ.md)\n- [Docs: CONTRIBUTING.md](https://github.com/coder/code-server/blob/master/docs/CONTRIBUTING.md)\n- [Community: GitHub Discussions](https://github.com/coder/code-server/discussions)\n- [Community: Slack](https://community.coder.com)"
2424
}
2525
]
2626
}

‎CHANGELOG.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ VS Code v99.99.999
2020
2121
-->
2222

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

2525
VS Code v0.00.0
2626

2727
### Changed
2828

2929
- Add here
3030

31-
## [4.0.2](https://github.com/cdr/code-server/releases/tag/v4.0.2) - 2022-01-27
31+
## [4.0.2](https://github.com/coder/code-server/releases/tag/v4.0.2) - 2022-01-27
3232

3333
VS Code v1.63.0
3434

@@ -39,7 +39,7 @@ VS Code v1.63.0
3939
file is missing. While we do include the script now we are leaving the
4040
variable omitted because the script does not work yet.
4141

42-
## [4.0.1](https://github.com/cdr/code-server/releases/tag/v4.0.1) - 2022-01-04
42+
## [4.0.1](https://github.com/coder/code-server/releases/tag/v4.0.1) - 2022-01-04
4343

4444
VS Code v1.63.0
4545

@@ -77,7 +77,7 @@ implementation (#4414).
7777

7878
- We fixed a XSS vulnerability by escaping HTML from messages in the error page (#4430).
7979

80-
## [3.12.0](https://github.com/cdr/code-server/releases/tag/v3.12.0) - 2021-09-15
80+
## [3.12.0](https://github.com/coder/code-server/releases/tag/v3.12.0) - 2021-09-15
8181

8282
VS Code v1.60.0
8383

@@ -89,15 +89,15 @@ VS Code v1.60.0
8989

9090
- Fix logout when using a base path (#3608).
9191

92-
## [3.11.1](https://github.com/cdr/code-server/releases/tag/v3.11.1) - 2021-08-06
92+
## [3.11.1](https://github.com/coder/code-server/releases/tag/v3.11.1) - 2021-08-06
9393

9494
Undocumented (see releases page).
9595

96-
## [3.11.0](https://github.com/cdr/code-server/releases/tag/v3.11.0) - 2021-06-14
96+
## [3.11.0](https://github.com/coder/code-server/releases/tag/v3.11.0) - 2021-06-14
9797

9898
Undocumented (see releases page).
9999

100-
## [3.10.2](https://github.com/cdr/code-server/releases/tag/v3.10.2) - 2021-05-21
100+
## [3.10.2](https://github.com/coder/code-server/releases/tag/v3.10.2) - 2021-05-21
101101

102102
VS Code v1.56.1
103103

@@ -113,7 +113,7 @@ VS Code v1.56.1
113113

114114
- Fix "Open Folder" on welcome page (#3437).
115115

116-
## [3.10.1](https://github.com/cdr/code-server/releases/tag/v3.10.1) - 2021-05-17
116+
## [3.10.1](https://github.com/coder/code-server/releases/tag/v3.10.1) - 2021-05-17
117117

118118
VS Code v1.56.1
119119

@@ -127,7 +127,7 @@ VS Code v1.56.1
127127

128128
- Use xdgBasedir.runtime instead of tmp (#3304).
129129

130-
## [3.10.0](https://github.com/cdr/code-server/releases/tag/v3.10.0) - 2021-05-10
130+
## [3.10.0](https://github.com/coder/code-server/releases/tag/v3.10.0) - 2021-05-10
131131

132132
VS Code v1.56.0
133133

@@ -158,4 +158,4 @@ VS Code v1.56.0
158158
This was added with `3.10.0`, which means any previous versions are not
159159
documented in the changelog.
160160

161-
To see those, please visit the [Releases page](https://github.com/cdr/code-server/releases).
161+
To see those, please visit the [Releases page](https://github.com/coder/code-server/releases).

‎ci/build/build-code-server.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ main() {
2626
echo "Downloading the cloud agent..."
2727

2828
set +e
29-
curl -fsSL "https://github.com/cdr/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent
29+
curl -fsSL "https://github.com/coder/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent
3030
chmod +x ./lib/coder-cloud-agent
3131
set -e
3232
fi

‎ci/build/code-server.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -eu
55
# Runs code-server with the bundled node binary.
66

77
_realpath() {
8-
# See https://github.com/cdr/code-server/issues/1537 on why no realpath or readlink -f.
8+
# See https://github.com/coder/code-server/issues/1537 on why no realpath or readlink -f.
99

1010
script="$1"
1111
cd "$(dirname "$script")"
@@ -16,7 +16,7 @@ _realpath() {
1616
&& cat package.json | grep -q '^ "name": "code-server",$'; then
1717
echo "***** Please use the script in bin/code-server instead!" >&2
1818
echo "***** This script will soon be removed!" >&2
19-
echo "***** See the release notes at https://github.com/cdr/code-server/releases/tag/v3.4.0" >&2
19+
echo "***** See the release notes at https://github.com/coder/code-server/releases/tag/v3.4.0" >&2
2020
fi
2121

2222
script="$(readlink "$(basename "$script")")"

‎ci/build/nfpm.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ maintainer: "Anmol Sethi <[email protected]>"
88
description: |
99
Run VS Code in the browser.
1010
vendor: "Coder"
11-
homepage: "https://github.com/cdr/code-server"
11+
homepage: "https://github.com/coder/code-server"
1212
license: "MIT"
1313

1414
contents:

‎ci/build/npm-postinstall.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ main() {
5757

5858
mkdir -p ./lib
5959

60-
if curl -fsSL "https://github.com/cdr/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent; then
60+
if curl -fsSL "https://github.com/coder/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent; then
6161
chmod +x ./lib/coder-cloud-agent
6262
else
6363
echo "Failed to download cloud agent; --link will not work"
6464
fi
6565

6666
if ! vscode_yarn; then
6767
echo "You may not have the required dependencies to build the native modules."
68-
echo "Please see https://github.com/cdr/code-server/blob/master/docs/npm.md"
68+
echo "Please see https://github.com/coder/code-server/blob/master/docs/npm.md"
6969
exit 1
7070
fi
7171

‎ci/build/release-prep.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ main() {
9090

9191
echo -e "\nOpening a draft PR on GitHub"
9292
# To read about these flags, visit the docs: https://cli.github.com/manual/gh_pr_create
93-
$CMD gh pr create --base main --title "release: $CODE_SERVER_VERSION_TO_UPDATE" --body "$RELEASE_TEMPLATE_STRING" --reviewer @cdr/code-server-reviewers --repo cdr/code-server --draft --assignee "@me"
93+
$CMD gh pr create --base main --title "release: $CODE_SERVER_VERSION_TO_UPDATE" --body "$RELEASE_TEMPLATE_STRING" --reviewer @coder/code-server-reviewers --repo coder/code-server --draft --assignee "@me"
9494

9595
# Open PR in browser
9696
$CMD gh pr view --web

‎ci/helm-chart/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: code-server
3-
description: A Helm chart for cdr/code-server
3+
description: A Helm chart for coder/code-server
44

55
# A chart can be either an 'application' or a 'library' chart.
66
#

0 commit comments

Comments
 (0)