From 04f1080451f489b4a038bb51ac73586546fdb3a8 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 9 Sep 2022 15:15:39 -0700 Subject: [PATCH] release: 4.7.0 (#5546) * docs: update MAINTAINING * refactor: use branch name in release-prep This makes a minor improvement to the `release-prep.sh` script to grab the version to update to from the branch name. * chore(release): bump version to 4.7.0 * fixup: bump version * docs: use latest instead of version * fixup: bump Chart version * chore: update CHANGELOG * chore: add license to test package.json * chore: bump @coder/logging to 3.0.0 * fix: change level to Warn --- CHANGELOG.md | 24 +++++++++++++++---- ci/build/release-prep.sh | 10 +++++--- ci/helm-chart/Chart.yaml | 4 ++-- docs/MAINTAINING.md | 18 ++------------ docs/collaboration.md | 2 +- docs/helm.md | 4 ++-- docs/manifest.json | 2 +- package.json | 4 ++-- src/node/cli.ts | 2 +- .../extensions/test-extension/package.json | 1 + test/unit/node/test-plugin/package.json | 2 +- yarn.lock | 8 +++---- 12 files changed, 44 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0ac072da..958cf2a23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,14 +20,30 @@ Code v99.99.999 --> -## [4.6.1](https://github.com/coder/code-server/releases/tag/v4.6.1) - 2022-08-31 +## [4.7.0](https://github.com/coder/code-server/releases/tag/v4.7.0) - 2022-09-09 + +Code v1.71.0 + +### Changed + +- Updated Code to 1.71.0 + +### Removed + +- Dropped heartbeat patch because it was implemented upstream + +### Fixed + +- Add flags --unsafe-perm --legacy-peer-deps in `npm-postinstsall.sh` which ensures installing with npm works correctly + +## [4.6.1](https://github.com/coder/code-server/releases/tag/v4.6.1) - 2022-09-31 Code v1.70.2 ### Changed -- Updated Code to 1.70.2. -- Updated `argon2` to 0.29.0 which should fix issues on FreeBSD. +- Updated Code to 1.70.2 +- Updated `argon2` to 0.29.0 which should fix issues on FreeBSD - Updated docs to suggest using `npm` instead of `yarn` ### Removed @@ -36,7 +52,7 @@ Code v1.70.2 ### Fixed -- Fixed preservation of `process.execArgv` which means you can pass `--prof` to profile code-server. +- Fixed preservation of `process.execArgv` which means you can pass `--prof` to profile code-server ## [4.6.0](https://github.com/coder/code-server/releases/tag/v4.6.0) - 2022-08-17 diff --git a/ci/build/release-prep.sh b/ci/build/release-prep.sh index 9e52d245e..0960414ca 100755 --- a/ci/build/release-prep.sh +++ b/ci/build/release-prep.sh @@ -9,6 +9,9 @@ set -euo pipefail +CHECKMARK="\xE2\x9C\x94" +DASH="-" + main() { if [ "${DRY_RUN-}" = 1 ]; then echo "Performing a dry run..." @@ -76,11 +79,12 @@ main() { CODE_SERVER_CURRENT_VERSION=$(node -pe "require('./package.json').version") # Ask which version we should update to # In the future, we'll automate this and determine the latest version automatically - echo "Current version: ${CODE_SERVER_CURRENT_VERSION}" + echo -e "$DASH Current version: ${CODE_SERVER_CURRENT_VERSION}" # The $'\n' adds a line break. See: https://stackoverflow.com/a/39581815/3015595 - read -r -p "What version of code-server do you want to update to?"$'\n' CODE_SERVER_VERSION_TO_UPDATE + CODE_SERVER_VERSION_TO_UPDATE=$(git rev-parse --abbrev-ref HEAD | perl -pe '($_)=/([0-9]+([.][0-9]+)+)/') + echo -e "$CHECKMARK Version in branch name" + echo -e "$CHECKMARK Updating to: $CODE_SERVER_VERSION_TO_UPDATE" - echo -e "Great! We'll prep a PR for updating to $CODE_SERVER_VERSION_TO_UPDATE\n" $CMD rg -g '!yarn.lock' -g '!*.svg' -g '!CHANGELOG.md' -g '!lib/vscode/**' --files-with-matches --fixed-strings "${CODE_SERVER_CURRENT_VERSION}" | $CMD xargs sd "$CODE_SERVER_CURRENT_VERSION" "$CODE_SERVER_VERSION_TO_UPDATE" $CMD git commit --no-verify -am "chore(release): bump version to $CODE_SERVER_VERSION_TO_UPDATE" diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 0f51b9958..e9cbb6275 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.2.1 +version: 3.2.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.6.1 +appVersion: 4.7.0 diff --git a/docs/MAINTAINING.md b/docs/MAINTAINING.md index a8944ba10..83249f4a1 100644 --- a/docs/MAINTAINING.md +++ b/docs/MAINTAINING.md @@ -8,7 +8,6 @@ - [Workflow](#workflow) - [Milestones](#milestones) - [Triage](#triage) - - [Project boards](#project-boards) - [Versioning](#versioning) - [Pull requests](#pull-requests) - [Merge strategies](#merge-strategies) @@ -42,7 +41,7 @@ Occasionally, other Coder employees may step in time to time to assist with code To onboard a new maintainer to the project, please make sure to do the following: -- [ ] Add to [coder/code-server-reviewers](https://github.com/orgs/coder/teams/code-server-reviewers) +- [ ] Add to [coder/code-server](https://github.com/orgs/coder/teams/code-server) - [ ] Add as Admin under [Repository Settings > Access](https://github.com/coder/code-server/settings/access) - [ ] Add to [npm Coder org](https://www.npmjs.com/org/coder) - [ ] Add as [AUR maintainer](https://aur.archlinux.org/packages/code-server/) (talk to Colin) @@ -72,7 +71,7 @@ Here are the milestones we use and how we use them: - "On Deck" -> Work under consideration for upcoming milestones. - "Backlog Candidates" -> Work that is not yet accepted for the backlog. We wait for the community to weigh in. -- "<0.0.0>" -> Work to be done for a specific version. +- "" -> Work to be done for said month. With this flow, any un-assigned issues are essentially in triage state. Once triaged, issues are either "Backlog" or "Backlog Candidates". They will @@ -91,19 +90,6 @@ We use the following process for triaging GitHub issues: 2. If not urgent, add to "Backlog" 3. Otherwise, add to "Backlog Candidate" for future consideration -### Project boards - -We use project boards for projects or goals that span multiple milestones. - -Think of this as a place to put miscellaneous things (like testing, clean up -stuff, etc). As a maintainer, random tasks may come up here and there. The -project boards give you places to add temporary notes before opening a new -issue. Given that our release milestones function off of issues, we believe -tasks should have dedicated issues. - -Project boards also give us a way to separate the issue triage from -bigger-picture, long-term work. - ## Versioning `` diff --git a/docs/collaboration.md b/docs/collaboration.md index 91f67e801..bc2e20a7c 100644 --- a/docs/collaboration.md +++ b/docs/collaboration.md @@ -60,6 +60,6 @@ As `code-server` is based on VS Code, you can follow the steps described on Duck code-server --enable-proposed-api genuitecllc.codetogether ``` - Another option would be to add a value in code-server's [config file](https://coder.com/docs/code-server/v4.6.1/FAQ#how-does-the-config-file-work). + Another option would be to add a value in code-server's [config file](https://coder.com/docs/code-server/latest/FAQ#how-does-the-config-file-work). 3. Refresh code-server and navigate to the CodeTogether icon in the sidebar to host or join a coding session. diff --git a/docs/helm.md b/docs/helm.md index 705f438a2..d9c13888b 100644 --- a/docs/helm.md +++ b/docs/helm.md @@ -1,6 +1,6 @@ # code-server Helm Chart -[![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square)](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)](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![AppVersion: 4.6.1](https://img.shields.io/badge/AppVersion-4.6.1-informational?style=flat-square)](https://img.shields.io/badge/AppVersion-4.6.1-informational?style=flat-square) +[![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square)](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)](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![AppVersion: 4.7.0](https://img.shields.io/badge/AppVersion-4.7.0-informational?style=flat-square)](https://img.shields.io/badge/AppVersion-4.7.0-informational?style=flat-square) [code-server](https://github.com/coder/code-server) code-server is VS Code running on a remote server, accessible through the browser. @@ -73,7 +73,7 @@ and their default values. | hostnameOverride | string | `""` | | image.pullPolicy | string | `"Always"` | | image.repository | string | `"codercom/code-server"` | -| image.tag | string | `"4.6.1"` | +| image.tag | string | `"4.7.0"` | | imagePullSecrets | list | `[]` | | ingress.enabled | bool | `false` | | nameOverride | string | `""` | diff --git a/docs/manifest.json b/docs/manifest.json index 4758c0ae5..f5ca081f8 100644 --- a/docs/manifest.json +++ b/docs/manifest.json @@ -1,5 +1,5 @@ { - "versions": ["v4.6.1"], + "versions": ["v4.7.0"], "routes": [ { "title": "Home", diff --git a/package.json b/package.json index f11b685f9..566c60b9e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-server", "license": "MIT", - "version": "4.6.1-1", + "version": "4.7.0", "description": "Run VS Code on a remote server.", "homepage": "https://github.com/coder/code-server", "bugs": { @@ -87,7 +87,7 @@ "@types/node": "^16.0.0" }, "dependencies": { - "@coder/logger": "1.1.16", + "@coder/logger": "^3.0.0", "argon2": "^0.29.0", "compression": "^1.7.4", "cookie-parser": "^1.4.5", diff --git a/src/node/cli.ts b/src/node/cli.ts index 97d02a4e9..df843eda2 100644 --- a/src/node/cli.ts +++ b/src/node/cli.ts @@ -501,7 +501,7 @@ export async function setDefaults(cliArgs: UserProvidedArgs, configArgs?: Config args.verbose = false break case LogLevel.Warn: - logger.level = Level.Warning + logger.level = Level.Warn args.verbose = false break case LogLevel.Error: diff --git a/test/e2e/extensions/test-extension/package.json b/test/e2e/extensions/test-extension/package.json index 4a9db00d5..8aca8815a 100644 --- a/test/e2e/extensions/test-extension/package.json +++ b/test/e2e/extensions/test-extension/package.json @@ -3,6 +3,7 @@ "description": "code-server test extension", "version": "0.0.1", "publisher": "coder", + "license": "MIT", "activationEvents": [ "onStartupFinished" ], diff --git a/test/unit/node/test-plugin/package.json b/test/unit/node/test-plugin/package.json index 8940ce4a7..4d4d1f39b 100644 --- a/test/unit/node/test-plugin/package.json +++ b/test/unit/node/test-plugin/package.json @@ -3,7 +3,7 @@ "name": "test-plugin", "version": "1.0.0", "engines": { - "code-server": "^4.6.1-1" + "code-server": "^4.7.0" }, "main": "out/index.js", "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 74339e1d0..279ac4df0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -201,10 +201,10 @@ lodash "^4.17.19" to-fast-properties "^2.0.0" -"@coder/logger@1.1.16": - version "1.1.16" - resolved "https://registry.yarnpkg.com/@coder/logger/-/logger-1.1.16.tgz#ee5b1b188f680733f35c11b065bbd139d618c1e1" - integrity sha512-X6VB1++IkosYY6amRAiMvuvCf12NA4+ooX+gOuu5bJIkdjmh4Lz7QpJcWRdgxesvo1msriDDr9E/sDbIWf6vsQ== +"@coder/logger@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@coder/logger/-/logger-3.0.0.tgz#fd4d2332ca375412c75cb5ba7767d3290b106dec" + integrity sha512-a0TYwulM+LiKBDKK7ZtKrOmOaEDR1yonCEOZbA+lNfVpmn7gWJBRdgg1O5Jj7ElKd4s9/w9udPVJfVxciyHfhA== "@eslint/eslintrc@^0.4.3": version "0.4.3"