From e5739346b8a09f95b38dee3298c1049bdf6d2dfe Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Mon, 18 Jul 2022 12:26:11 -0700 Subject: [PATCH 01/10] chore(release): bump version to 4.5.1 --- ci/helm-chart/Chart.yaml | 2 +- ci/helm-chart/values.yaml | 2 +- docs/MAINTAINING.md | 2 +- docs/collaboration.md | 2 +- docs/helm.md | 4 ++-- docs/manifest.json | 4 ++-- package.json | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 760278db964d..20c980bd0cb4 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -20,4 +20,4 @@ version: 2.6.0 # 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.5.0 +appVersion: 4.5.1 diff --git a/ci/helm-chart/values.yaml b/ci/helm-chart/values.yaml index 636a16951e59..77e65b45238d 100644 --- a/ci/helm-chart/values.yaml +++ b/ci/helm-chart/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: codercom/code-server - tag: '4.5.0' + tag: '4.5.1' pullPolicy: Always # Specifies one or more secrets to be used when pulling images from a diff --git a/docs/MAINTAINING.md b/docs/MAINTAINING.md index 6ef0251ad85a..bf6238f33b35 100644 --- a/docs/MAINTAINING.md +++ b/docs/MAINTAINING.md @@ -164,7 +164,7 @@ If you're the current release manager, follow these steps: ### Publishing a release -1. Create a new branch called `v0.0.0` (replace 0s with actual version aka v4.5.0) +1. Create a new branch called `v0.0.0` (replace 0s with actual version aka v4.5.1) 1. Run `yarn release:prep` and type in the new version (e.g., `3.8.1`) 1. GitHub Actions will generate the `npm-package`, `release-packages` and `release-images` artifacts. You do not have to wait for this step to complete diff --git a/docs/collaboration.md b/docs/collaboration.md index 7430f4a17ef5..73dbb302e496 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.5.0/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/v4.5.1/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 500ee9ec44d8..1643dbbc889e 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.5.0](https://img.shields.io/badge/AppVersion-4.5.0-informational?style=flat-square)](https://img.shields.io/badge/AppVersion-4.5.0-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.5.1](https://img.shields.io/badge/AppVersion-4.5.1-informational?style=flat-square)](https://img.shields.io/badge/AppVersion-4.5.1-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.5.0"` | +| image.tag | string | `"4.5.1"` | | imagePullSecrets | list | `[]` | | ingress.enabled | bool | `false` | | nameOverride | string | `""` | diff --git a/docs/manifest.json b/docs/manifest.json index 2511b2091c1f..69eb5c2c6dff 100644 --- a/docs/manifest.json +++ b/docs/manifest.json @@ -1,5 +1,5 @@ { - "versions": ["v4.5.0"], + "versions": ["v4.5.1"], "routes": [ { "title": "Home", @@ -73,7 +73,7 @@ { "title": "Upgrade", "description": "How to upgrade code-server.", - "icon": "", + "icon": "", "path": "./upgrade.md" }, { diff --git a/package.json b/package.json index 5fcdc3789fc0..75708339b62f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-server", "license": "MIT", - "version": "4.5.0", + "version": "4.5.1", "description": "Run VS Code on a remote server.", "homepage": "https://github.com/coder/code-server", "bugs": { From 703b03b665bddc252d80ae674eb92e1bfbdec6ad Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Mon, 18 Jul 2022 14:42:31 -0700 Subject: [PATCH 02/10] chore: bump helm chart --- ci/helm-chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 20c980bd0cb4..9dd6367cebad 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,7 +15,7 @@ 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: 2.6.0 +version: 2.6.1 # 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 From 1a9a4e06dfed1c3f6dda9647ccc09f8147bf0b1e Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Mon, 18 Jul 2022 14:54:04 -0700 Subject: [PATCH 03/10] chore: update CHANGELOG --- CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e54ceac21825..50f16fdd68a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,38 @@ Code v99.99.999 --> +## [4.5.1](https://github.com/coder/code-server/releases/tag/v4.5.1) - 2022-07-18 + +Code v1.68.1 + +### Changed + +- We now use `release/v<0.0.0>` for the release branch name so it doesn't + conflict with the tag name +- Added `.prettierignore` to ignore formatting files in `lib/vscode` + +### Added + +- Allow more comprehensive affinity config in Helm chart +- Added custom message in Homebrew PR to make sure code-server maintainers are + tagged +- Allow setting `priorityClassName` via Helm chart +- Added troubleshooting docs to `CONTRIBUTING.md` + +### Fixed + +- Removed default memory limit which was set via `NODE_OPTIONS` +- Changed output in pipe to make it easier to debug code-server when doing live + edits +- Fixed display-language patch to use correct path which broke in 4.5.0 +- Fixed multiple code-server windows opening when using the code-server CLI in + the Integrated Terminal +- Fixed Integrated Terminal not working when web base was not the root path + +### Security + +- Updated `glob-parent` version in dependencies + ## [4.5.0](https://github.com/coder/code-server/releases/tag/v4.5.0) - 2022-06-29 Code v1.68.1 From 2e5d50b10a780416651243180c048ef26463871b Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Mon, 18 Jul 2022 14:54:14 -0700 Subject: [PATCH 04/10] Revert "chore: bump helm chart" This reverts commit 703b03b665bddc252d80ae674eb92e1bfbdec6ad. --- ci/helm-chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 9dd6367cebad..20c980bd0cb4 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,7 +15,7 @@ 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: 2.6.1 +version: 2.6.0 # 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 From 3d8be5e1bf7fbce28117329b0ec4ec3f0f5fa0d3 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Mon, 18 Jul 2022 14:54:42 -0700 Subject: [PATCH 05/10] chore: bump helm chart to 3.0.0 --- ci/helm-chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/helm-chart/Chart.yaml b/ci/helm-chart/Chart.yaml index 20c980bd0cb4..3e30d4fafd1d 100644 --- a/ci/helm-chart/Chart.yaml +++ b/ci/helm-chart/Chart.yaml @@ -15,7 +15,7 @@ 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: 2.6.0 +version: 3.0.0 # 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 From 6372aea4ba955a082b55bb5f5ab17e79eaf0c11f Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Mon, 18 Jul 2022 15:48:09 -0700 Subject: [PATCH 06/10] revert: remove bad change to manifes.json icon --- docs/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manifest.json b/docs/manifest.json index 69eb5c2c6dff..278aaf5e6b7b 100644 --- a/docs/manifest.json +++ b/docs/manifest.json @@ -73,7 +73,7 @@ { "title": "Upgrade", "description": "How to upgrade code-server.", - "icon": "", + "icon": "", "path": "./upgrade.md" }, { From 3cd34755404d5b9cb6e403cd311e1b3cab908bd7 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Tue, 19 Jul 2022 09:22:09 -0700 Subject: [PATCH 07/10] fix(ci): add package.json.version to code cachekey Before this, creating a release sometimes prevented vscode from rebuilding and using the cache instead. Now we use the package.json.version in the cache key to "bust" the cache if the package.json version is updated (aka a release). Fixes #5316 --- .github/workflows/ci.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0eb615b018ea..8a2748337dd1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -143,14 +143,18 @@ jobs: id: vscode-rev run: echo "::set-output name=rev::$(git rev-parse HEAD:./lib/vscode)" - # We need to rebuild when we have a new version of Code or when any of - # the patches changed. Use VSCODE_CACHE_VERSION to force a rebuild. + - name: Get version + id: version + run: echo "::set-output name=version::$(jq -r .version package.json)" + + # We need to rebuild when we have a new version of Code or when any of + # the patches changed. Use VSCODE_CACHE_VERSION to force a rebuild. - name: Fetch prebuilt Code package from cache id: cache-vscode uses: actions/cache@v3 with: path: lib/vscode-reh-web-* - key: vscode-reh-package-${{ secrets.VSCODE_CACHE_VERSION }}-${{ steps.vscode-rev.outputs.rev }}-${{ hashFiles('patches/*.diff') }} + key: vscode-reh-package-${{ secrets.VSCODE_CACHE_VERSION }}-${{ steps.vscode-rev.outputs.rev }}-${{ steps.version.outputs.version }}-${{ hashFiles('patches/*.diff') }} - name: Build vscode if: steps.cache-vscode.outputs.cache-hit != 'true' From 0e8ef4947d6dadcbec94c3fb24692da362e47f0d Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Tue, 19 Jul 2022 10:01:05 -0700 Subject: [PATCH 08/10] Update .github/workflows/ci.yaml Co-authored-by: Asher --- .github/workflows/ci.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8a2748337dd1..a4fe31026b08 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -147,8 +147,10 @@ jobs: id: version run: echo "::set-output name=version::$(jq -r .version package.json)" - # We need to rebuild when we have a new version of Code or when any of - # the patches changed. Use VSCODE_CACHE_VERSION to force a rebuild. + # We need to rebuild when we have a new version of Code, when any of + # the patches changed, or when the code-server version changes (since + # it gets embedded into the code). Use VSCODE_CACHE_VERSION to + # force a rebuild. - name: Fetch prebuilt Code package from cache id: cache-vscode uses: actions/cache@v3 From 969eb55ac37bf4f75caa728b859254b8d04ddcae Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Tue, 19 Jul 2022 10:11:16 -0700 Subject: [PATCH 09/10] fixup: formatting --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a4fe31026b08..0aa15c5aa789 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -148,8 +148,8 @@ jobs: run: echo "::set-output name=version::$(jq -r .version package.json)" # We need to rebuild when we have a new version of Code, when any of - # the patches changed, or when the code-server version changes (since - # it gets embedded into the code). Use VSCODE_CACHE_VERSION to + # the patches changed, or when the code-server version changes (since + # it gets embedded into the code). Use VSCODE_CACHE_VERSION to # force a rebuild. - name: Fetch prebuilt Code package from cache id: cache-vscode From 8ccacf3fef4b4e5199783c138d9815382fb55592 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Tue, 19 Jul 2022 11:06:16 -0700 Subject: [PATCH 10/10] Revert "refactor: remove version check e2e test" This reverts commit b23c398b7d725e46b4b7a0bbc900aebc6bd277f3. --- test/e2e/openHelpAbout.test.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/e2e/openHelpAbout.test.ts b/test/e2e/openHelpAbout.test.ts index 83e26caeebe3..74b54c812d12 100644 --- a/test/e2e/openHelpAbout.test.ts +++ b/test/e2e/openHelpAbout.test.ts @@ -1,3 +1,4 @@ +import { version } from "../../src/node/constants" import { describe, test, expect } from "./baseFixture" describe("Open Help > About", true, [], {}, () => { @@ -5,8 +6,12 @@ describe("Open Help > About", true, [], {}, () => { // Open using the menu. await codeServerPage.navigateMenus(["Help", "About"]) + const isDevMode = process.env.VSCODE_DEV === "1" + // Look for code-server info div. - const element = await codeServerPage.page.waitForSelector(`div[role="dialog"] >> text=code-server`) + const element = await codeServerPage.page.waitForSelector( + `div[role="dialog"] >> text=code-server: ${isDevMode ? "Unknown" : "v" + version}`, + ) expect(element).not.toBeNull() }) })