Compare commits

..

5 Commits

Author SHA1 Message Date
Asher
36daac3031 Update to 1.75.1 2023-02-13 07:45:24 -09:00
Asher
45aef719d3 Make sure heartbeat isActive resolves
This does not seem to actually cause an issue (not resolving ends up
with the same behavior as resolving with false) but I am not sure if the
hanging promises would be a memory leak so seems best to fix.
2023-02-08 11:43:40 -09:00
Asher
6d6c5e18d1 Fix watch script ignoring stdout
This was lost due to the change from fork to spawn.
2023-02-08 11:42:28 -09:00
Asher
17bca521af Update changelog 2023-02-07 13:57:53 -09:00
Asher
82073743b1 Update release guide 2023-02-07 13:57:52 -09:00
6 changed files with 43 additions and 22 deletions

View File

@@ -20,6 +20,14 @@ Code v99.99.999
--> -->
## [4.10.0](https://github.com/coder/code-server/releases/tag/v4.10.0) - TBD
Code v1.75.0
### Changed
- Updated to Code 1.75.0
## [4.9.1](https://github.com/coder/code-server/releases/tag/v4.9.1) - 2022-12-15 ## [4.9.1](https://github.com/coder/code-server/releases/tag/v4.9.1) - 2022-12-15
Code v1.73.1 Code v1.73.1

View File

@@ -31,11 +31,12 @@ class Watcher {
// Pass CLI args, save for `node` and the initial script name. // Pass CLI args, save for `node` and the initial script name.
const args = process.argv.slice(2) const args = process.argv.slice(2)
this.webServer = spawn("node", [path.join(this.rootPath, "out/node/entry.js"), ...args]) this.webServer = spawn("node", [path.join(this.rootPath, "out/node/entry.js"), ...args])
onLine(this.webServer, (line) => console.log("[code-server]", line))
const { pid } = this.webServer const { pid } = this.webServer
this.webServer.on("exit", () => console.log("[Code Server]", `Web process ${pid} exited`)) this.webServer.on("exit", () => console.log("[code-server]", `Web process ${pid} exited`))
console.log("\n[Code Server]", `Spawned web server process ${pid}`) console.log("\n[code-server]", `Spawned web server process ${pid}`)
} }
//#endregion //#endregion
@@ -82,10 +83,10 @@ class Watcher {
private parseVSCodeLine: OnLineCallback = (strippedLine, originalLine) => { private parseVSCodeLine: OnLineCallback = (strippedLine, originalLine) => {
if (!strippedLine.length) return if (!strippedLine.length) return
console.log("[VS Code]", originalLine) console.log("[Code OSS]", originalLine)
if (strippedLine.includes("Finished compilation with")) { if (strippedLine.includes("Finished compilation with")) {
console.log("[VS Code] ✨ Finished compiling! ✨", "(Refresh your web browser ♻️)") console.log("[Code OSS] ✨ Finished compiling! ✨", "(Refresh your web browser ♻️)")
this.reloadWebServer() this.reloadWebServer()
} }
} }
@@ -93,10 +94,10 @@ class Watcher {
private parseCodeServerLine: OnLineCallback = (strippedLine, originalLine) => { private parseCodeServerLine: OnLineCallback = (strippedLine, originalLine) => {
if (!strippedLine.length) return if (!strippedLine.length) return
console.log("[Compiler][Code Server]", originalLine) console.log("[Compiler][code-server]", originalLine)
if (strippedLine.includes("Watching for file changes")) { if (strippedLine.includes("Watching for file changes")) {
console.log("[Compiler][Code Server]", "Finished compiling!", "(Refresh your web browser ♻️)") console.log("[Compiler][code-server]", "Finished compiling!", "(Refresh your web browser ♻️)")
this.reloadWebServer() this.reloadWebServer()
} }
} }

View File

@@ -142,24 +142,28 @@ changelog](https://github.com/emacs-mirror/emacs/blob/master/etc/NEWS).
### Publishing a release ### Publishing a release
1. Go to GitHub Actions > Draft release > Run workflow off commit you want to 1. Go to GitHub Actions > Draft release > Run workflow on the commit you want to
release. CI will automatically upload the artifacts to the release. Make sure CI release. Make sure CI has finished the build workflow on that commit or this
has finished on that commit. will fail.
1. CI will automatically grab the 2. CI will automatically grab the build artifact on that commit, inject the
artifacts, publish the NPM package from `npm-package`, and publish the Docker version into the `package.json`, put together platform-specific packages, and
Hub image from `release-images`. upload those packages to a draft release.
1. Publish release. 3. Summarize the major changes in the `CHANGELOG.md`.
1. After, create a new branch called `release/v0.0.0` (replace 0s with actual version aka v4.5.0) 4. Copy the relevant changelog section to the release then publish it.
1. Summarize the major changes in the `CHANGELOG.md` 5. CI will automatically publish the NPM package, Docker image, and update
1. Bump chart version in `Chart.yaml`. Homebrew using the published release assets.
6. Bump the chart version in `Chart.yaml` and merge in the changelog updates.
#### Release Candidates #### Release Candidates
We prefer to do release candidates so the community can test things before a full-blown release. To do this follow the same steps as above but: We prefer to do release candidates so the community can test things before a
full-blown release. To do this follow the same steps as above but:
1. Only bump version in `package.json` 1. Add a `-rc.<number>` suffix to the version.
1. use `0.0.0-rc.0` 2. When you publish the release select "pre-release". CI will not automatically
1. When you publish the release, select "pre-release" publish pre-releases.
3. Do not update the chart version or merge in the changelog until the final
release.
#### AUR #### AUR

View File

@@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index
=================================================================== ===================================================================
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html --- code-server.orig/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
+++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html +++ code-server/lib/vscode/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
@@ -322,6 +322,12 @@ @@ -324,6 +324,12 @@
const hostname = location.hostname; const hostname = location.hostname;

View File

@@ -33,7 +33,15 @@ import { CodeServerRouteWrapper } from "./vscode"
export const register = async (app: App, args: DefaultedArgs): Promise<Disposable["dispose"]> => { export const register = async (app: App, args: DefaultedArgs): Promise<Disposable["dispose"]> => {
const heart = new Heart(path.join(paths.data, "heartbeat"), async () => { const heart = new Heart(path.join(paths.data, "heartbeat"), async () => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// getConnections appears to not call the callback when there are no more
// connections. Feels like it must be a bug? For now add a timer to make
// sure we eventually resolve.
const timer = setTimeout(() => {
logger.debug("Node failed to respond with connections; assuming zero")
resolve(false)
}, 5000)
app.server.getConnections((error, count) => { app.server.getConnections((error, count) => {
clearTimeout(timer)
if (error) { if (error) {
return reject(error) return reject(error)
} }