Skip to content

Commit 3d9f922

Browse files
jsjoeiojsjoeio
authored
Merge branch 'main' into patch-1
2 parents ee78c31 + 99542e6 commit 3d9f922

File tree

11 files changed

+79
-57
lines changed

11 files changed

+79
-57
lines changed

‎CHANGELOG.md

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33
# Changelog
44

55
- [Changelog](#changelog)
6-
- [Next Version](#next-version)
6+
- [3.10.2](#3102)
77
- [New Features](#new-features)
8-
- [3.10.1](#3101)
98
- [Bug Fixes](#bug-fixes)
10-
- [Documentation](#documentation)
119
- [Development](#development)
10+
- [3.10.1](#3101)
11+
- [Bug Fixes](#bug-fixes-1)
12+
- [Documentation](#documentation)
13+
- [Development](#development-1)
1214
- [3.10.0](#3100)
1315
- [New Features](#new-features-1)
14-
- [Bug Fixes](#bug-fixes-1)
16+
- [Bug Fixes](#bug-fixes-2)
1517
- [Documentation](#documentation-1)
16-
- [Development](#development-1)
18+
- [Development](#development-2)
1719
- [Previous versions](#previous-versions)
1820

1921
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -53,14 +55,22 @@ VS Code v0.00.0
5355
5456
-->
5557

56-
## Next Version
58+
## 3.10.2
5759

5860
VS Code v1.56.1
5961

6062
### New Features
6163

62-
- feat: support `extraInitContainers` in helm chart values
63-
- feat: change `extraContainers` to support templating in helm chart
64+
- feat: support `extraInitContainers` in helm chart values #3393 @strowk
65+
- feat: change `extraContainers` to support templating in helm chart #3393 @strowk
66+
67+
### Bug Fixes
68+
69+
- fix: use correct command to Open Folder on Welcome page #3437 @jsjoeio
70+
71+
### Development
72+
73+
- fix(ci): update brew-bump.sh to update remote first #3438 @jsjoeio
6474

6575
## 3.10.1
6676

@@ -79,7 +89,6 @@ VS Code v1.56.1
7989
- docs(maintaining): add merge strategies section #3379 @jsjoeio
8090
- refactor: move default PR template #3375 @jsjoeio
8191
- docs(contributing): add commits section #3377 @jsjoeio
82-
- docs(maintaining): add process for release managers #3360 @jsjoeio
8392

8493
### Development
8594

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# code-server &middot; [!["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

33
[![codecov](https://codecov.io/gh/cdr/code-server/branch/main/graph/badge.svg?token=5iM9farjnC)](https://codecov.io/gh/cdr/code-server)
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.10.1/docs)
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.10.2/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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,14 @@ 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-
# Ensure the tests are passing and code coverage is up-to-date
87-
echo -e "Running unit tests and updating code coverage...\n"
88-
$CMD yarn test:unit
89-
9086
$CMD git commit -am "chore(release): bump version to $CODE_SERVER_VERSION_TO_UPDATE"
9187

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

9591
echo -e "\nOpening a draft PR on GitHub"
9692
# To read about these flags, visit the docs: https://cli.github.com/manual/gh_pr_create
97-
$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
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"
9894

9995
# Open PR in browser
10096
$CMD gh pr view --web

‎ci/helm-chart/Chart.yaml

Lines changed: 1 addition & 1 deletion
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.10.1
23+
appVersion: 3.10.2

‎ci/helm-chart/README.md

Lines changed: 2 additions & 2 deletions
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.10.1](https://img.shields.io/badge/AppVersion-3.10.1-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.10.2](https://img.shields.io/badge/AppVersion-3.10.2-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.
@@ -73,7 +73,7 @@ and their default values.
7373
| hostnameOverride | string | `""` | |
7474
| image.pullPolicy | string | `"Always"` | |
7575
| image.repository | string | `"codercom/code-server"` | |
76-
| image.tag | string | `"3.10.1"` | |
76+
| image.tag | string | `"3.10.2"` | |
7777
| imagePullSecrets | list | `[]` | |
7878
| ingress.enabled | bool | `false` | |
7979
| nameOverride | string | `""` | |

‎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: '3.10.1'
9+
tag: '3.10.2'
1010
pullPolicy: Always
1111

1212
imagePullSecrets: []

‎ci/steps/brew-bump.sh

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,36 @@ main() {
55
cd "$(dirname "$0")/../.."
66
# Only sourcing this so we get access to $VERSION
77
source ./ci/lib.sh
8+
9+
# NOTE: we need to make sure cdrci/homebrew-core
10+
# is up-to-date
11+
# otherwise, brew bump-formula-pr will use an
12+
# outdated base
13+
echo "Cloning cdrci/homebrew-core"
14+
git clone https://github.com/cdrci/homebrew-core.git
15+
16+
echo "Changing into homebrew-core directory"
17+
cd homebrew-core && pwd
18+
19+
echo "Adding Homebrew/homebrew-core as $(upstream)"
20+
git remote add upstream https://github.com/Homebrew/homebrew-core.git
21+
22+
echo "Fetching upstream commits..."
23+
git fetch upstream
24+
25+
echo "Merging in latest changes"
26+
git merge upstream/master
27+
28+
echo "Pushing changes to cdrci/homebrew-core fork on GitHub"
29+
git push origin master
30+
831
# Find the docs for bump-formula-pr here
932
# https://github.com/Homebrew/brew/blob/master/Library/Homebrew/dev-cmd/bump-formula-pr.rb#L18
1033
brew bump-formula-pr --force --version="${VERSION}" code-server --no-browse --no-audit
34+
35+
# Clean up and remove homebrew-core
36+
cd ..
37+
rm -rf homebrew-core
1138
}
1239

1340
main "$@"

‎install.sh

Lines changed: 1 addition & 1 deletion
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.10.1/docs/install.md#yarn-npm"
422+
echoerr "See the docs https://github.com/cdr/code-server/blob/v3.10.2/docs/install.md#yarn-npm"
423423
exit 1
424424
}
425425

‎lib/vscode/src/vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default () => `
2020
<h2 class="caption">${escape(localize('welcomePage.start', "Start"))}</h2>
2121
<ul>
2222
<li><a href="command:workbench.action.files.newUntitledFile">${escape(localize('welcomePage.newFile', "New file"))}</a></li>
23-
<li class="mac-only"><a href="command:workbench.action.files.openFileFolder">${escape(localize('welcomePage.openFolder', "Open folder..."))}</a> or <a href="command:git.clone">${escape(localize('welcomePage.gitClone', "clone repository..."))}</a></li>
23+
<li class="mac-only"><a href="command:workbench.action.files.openFolder">${escape(localize('welcomePage.openFolder', "Open folder..."))}</a> or <a href="command:git.clone">${escape(localize('welcomePage.gitClone', "clone repository..."))}</a></li>
2424
<li class="windows-only linux-only"><a href="command:workbench.action.files.openFolder">${escape(localize('welcomePage.openFolder', "Open folder..."))}</a> or <a href="command:git.clone">${escape(localize('welcomePage.gitClone', "clone repository..."))}</a></li>
2525
</ul>
2626
</div>

‎package.json

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

0 commit comments

Comments
 (0)