Skip to content

Commit fe2dc2d

Browse files
jsjoeiojsjoeio
authored
Merge 003dc0f into 3a49299 
2 parents 3a49299 + 003dc0f commit fe2dc2d

File tree

10 files changed

+29
-30
lines changed

10 files changed

+29
-30
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# code-server · [!["GitHub Discussions"](https://img.shields.io/badge/%20GitHub-%20Discussions-gray.svg?longCache=true&logo=github&colorB=purple)](https://github.com/cdr/code-server/discussions) [!["Join us on Slack"](https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=brightgreen)](https://cdr.co/join-community) [![Twitter Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=social)](https://twitter.com/coderhq)
22

3-
![Lines](https://img.shields.io/badge/Coverage-51.55%25-red.svg)
4-
[![See latest docs](https://img.shields.io/static/v1?label=Docs&message=see%20latest%20&color=blue)](https://github.com/cdr/code-server/tree/v3.9.2/docs)
3+
![Lines](https://img.shields.io/badge/Coverage-51.47%25-green.svg)
4+
[![See latest docs](https://img.shields.io/static/v1?label=Docs&message=see%20latest%20&color=blue)](https://github.com/cdr/code-server/tree/v3.9.3/docs)
55

66
Run [VS Code](https://github.com/Microsoft/vscode) on any machine anywhere and access it in the browser.
77

‎ci/build/release-prep.sh

+12-13
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,17 @@ main() {
6868
exit
6969
fi
7070

71+
# Note: we need to set upstream as well or the gh pr create step will fail
72+
# See: https://github.com/cli/cli/issues/575
73+
CURRENT_BRANCH=$(git branch | grep '\*' | cut -d' ' -f2-)
74+
if [[ -z $(git config "branch.${CURRENT_BRANCH}.remote") ]]; then
75+
echo "Doesn't look like you've pushed this branch to remote"
76+
# Note: we need to set upstream as well or the gh pr create step will fail
77+
# See: https://github.com/cli/cli/issues/575
78+
echo "Please set the upstream and then run the script"
79+
exit 1
80+
fi
81+
7182
# credit to jakwuh for this solution
7283
# https://gist.github.com/DarrenN/8c6a5b969481725a4413#gistcomment-1971123
7384
CODE_SERVER_CURRENT_VERSION=$(node -pe "require('./package.json').version")
@@ -86,22 +97,10 @@ main() {
8697
# Updates the Lines badge in the README
8798
$CMD yarn badges
8899
# Updates the svg to be green for the badge
89-
$CMD sd "red.svg" "green.svg" ../../README.md
100+
$CMD sd "red.svg" "green.svg" ./README.md
90101

91102
$CMD git commit -am "chore(release): bump version to $CODE_SERVER_VERSION_TO_UPDATE"
92103

93-
# Note: we need to set upstream as well or the gh pr create step will fail
94-
# See: https://github.com/cli/cli/issues/575
95-
CURRENT_BRANCH=$(git branch | grep '\*' | cut -d' ' -f2-)
96-
if [[ -z $(git config "branch.${CURRENT_BRANCH}.remote") ]]; then
97-
echo "Doesn't look like you've pushed this branch to remote"
98-
echo -e "Pushing now using: git push origin $CURRENT_BRANCH\n"
99-
# Note: we need to set upstream as well or the gh pr create step will fail
100-
# See: https://github.com/cli/cli/issues/575
101-
echo "Please set the upstream and re-run the script"
102-
exit 1
103-
fi
104-
105104
# This runs from the root so that's why we use this path vs. ../../
106105
RELEASE_TEMPLATE_STRING=$(cat ./.github/PULL_REQUEST_TEMPLATE/release_template.md)
107106

‎ci/helm-chart/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ version: 1.0.3
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: 3.9.2
23+
appVersion: 3.9.3

‎ci/helm-chart/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# code-server
22

3-
![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.2](https://img.shields.io/badge/AppVersion-3.9.2-informational?style=flat-square)
3+
![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.3](https://img.shields.io/badge/AppVersion-3.9.3-informational?style=flat-square)
44

55
[code-server](https://github.com/cdr/code-server) code-server is VS Code running
66
on a remote server, accessible through the browser.
@@ -72,7 +72,7 @@ and their default values.
7272
| hostnameOverride | string | `""` | |
7373
| image.pullPolicy | string | `"Always"` | |
7474
| image.repository | string | `"codercom/code-server"` | |
75-
| image.tag | string | `"3.9.2"` | |
75+
| image.tag | string | `"3.9.3"` | |
7676
| imagePullSecrets | list | `[]` | |
7777
| ingress.enabled | bool | `false` | |
7878
| nameOverride | string | `""` | |

‎ci/helm-chart/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replicaCount: 1
66

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

1212
imagePullSecrets: []

‎ci/lib.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ get_artifacts_url() {
6060
local artifacts_url
6161
local workflow_runs_url="https://api.github.com/repos/cdr/code-server/actions/workflows/ci.yaml/runs?status=success&event=pull_request"
6262
# For releases, we look for run based on the branch name v$code_server_version
63-
# example: v3.9.2
63+
# example: v3.9.3
6464
local version_branch="v$VERSION"
6565
artifacts_url=$(curl -fsSL "$workflow_runs_url" | jq -r ".workflow_runs[] | select(.head_branch == \"$version_branch\") | .artifacts_url" | head -n 1)
6666
if [[ -z "$artifacts_url" ]]; then

‎docs/install.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ NOTE: The standalone arm64 .deb does not support Ubuntu <16.04.
9393
Please upgrade or [build with yarn](#yarn-npm).
9494

9595
```bash
96-
curl -fOL https://github.com/cdr/code-server/releases/download/v3.9.2/code-server_3.9.2_amd64.deb
97-
sudo dpkg -i code-server_3.9.2_amd64.deb
96+
curl -fOL https://github.com/cdr/code-server/releases/download/v3.9.3/code-server_3.9.3_amd64.deb
97+
sudo dpkg -i code-server_3.9.3_amd64.deb
9898
sudo systemctl enable --now code-server@$USER
9999
# Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
100100
```
@@ -105,8 +105,8 @@ NOTE: The standalone arm64 .rpm does not support CentOS 7.
105105
Please upgrade or [build with yarn](#yarn-npm).
106106

107107
```bash
108-
curl -fOL https://github.com/cdr/code-server/releases/download/v3.9.2/code-server-3.9.2-amd64.rpm
109-
sudo rpm -i code-server-3.9.2-amd64.rpm
108+
curl -fOL https://github.com/cdr/code-server/releases/download/v3.9.3/code-server-3.9.3-amd64.rpm
109+
sudo rpm -i code-server-3.9.3-amd64.rpm
110110
sudo systemctl enable --now code-server@$USER
111111
# Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml
112112
```
@@ -205,10 +205,10 @@ Here is an example script for installing and using a standalone `code-server` re
205205

206206
```bash
207207
mkdir -p ~/.local/lib ~/.local/bin
208-
curl -fL https://github.com/cdr/code-server/releases/download/v3.9.2/code-server-3.9.2-linux-amd64.tar.gz \
208+
curl -fL https://github.com/cdr/code-server/releases/download/v3.9.3/code-server-3.9.3-linux-amd64.tar.gz \
209209
| tar -C ~/.local/lib -xz
210-
mv ~/.local/lib/code-server-3.9.2-linux-amd64 ~/.local/lib/code-server-3.9.2
211-
ln -s ~/.local/lib/code-server-3.9.2/bin/code-server ~/.local/bin/code-server
210+
mv ~/.local/lib/code-server-3.9.3-linux-amd64 ~/.local/lib/code-server-3.9.3
211+
ln -s ~/.local/lib/code-server-3.9.3/bin/code-server ~/.local/bin/code-server
212212
PATH="~/.local/bin:$PATH"
213213
code-server
214214
# Now visit http://127.0.0.1:8080. Your password is in ~/.config/code-server/config.yaml

‎install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ install_npm() {
419419
echoh
420420
echoerr "Please install npm or yarn to install code-server!"
421421
echoerr "You will need at least node v12 and a few C dependencies."
422-
echoerr "See the docs https://github.com/cdr/code-server/blob/v3.9.2/docs/install.md#yarn-npm"
422+
echoerr "See the docs https://github.com/cdr/code-server/blob/v3.9.3/docs/install.md#yarn-npm"
423423
exit 1
424424
}
425425

‎lib/vscode/test/smoke/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@types/node": "^12.19.9",
1919
"@types/rimraf": "^2.0.4",
2020
"cpx": "^1.5.0",
21-
"htmlparser2": "^3.9.2",
21+
"htmlparser2": "^3.9.3",
2222
"mkdirp": "^0.5.1",
2323
"ncp": "^2.0.0",
2424
"npm-run-all": "^4.1.5",

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-server",
33
"license": "MIT",
4-
"version": "3.9.2",
4+
"version": "3.9.3",
55
"description": "Run VS Code on a remote server.",
66
"homepage": "https://github.com/cdr/code-server",
77
"bugs": {

0 commit comments

Comments
 (0)