bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into release/v4.5.1

This commit is contained in:
Joe Previte 2022-07-18 14:55:17 -07:00 committed by GitHub
parent 3d8be5e1bf de317a09fe
commit 9b8a063b88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/npm-brew.yaml vendored
View File

@ -31,7 +31,7 @@ jobs:
uses: dawidd6/action-download-artifact@v2 uses: dawidd6/action-download-artifact@v2
id: download id: download
with: with:
branch: v${{ steps.version.outputs.version }} branch: release/v${{ steps.version.outputs.version }}
workflow: ci.yaml workflow: ci.yaml
workflow_conclusion: completed workflow_conclusion: completed
name: "npm-package" name: "npm-package"

5
ci/helm-chart/templates/deployment.yaml
View File

@ -25,6 +25,9 @@ spec:
{{- if .Values.hostnameOverride }} {{- if .Values.hostnameOverride }}
hostname: {{ .Values.hostnameOverride }} hostname: {{ .Values.hostnameOverride }}
{{- end }} {{- end }}
{{- if .Values.priorityClassName }}
priorityClassName: {{ .Values.priorityClassName }}
{{- end }}
{{- if .Values.securityContext.enabled }} {{- if .Values.securityContext.enabled }}
securityContext: securityContext:
fsGroup: {{ .Values.securityContext.fsGroup }} fsGroup: {{ .Values.securityContext.fsGroup }}
@ -116,7 +119,7 @@ spec:
{{- end }} {{- end }}
{{- with .Values.affinity }} {{- with .Values.affinity }}
affinity: affinity:
{{- toYaml . | nindent 8 }} {{- tpl . $ | nindent 8 }}
{{- end }} {{- end }}
{{- with .Values.tolerations }} {{- with .Values.tolerations }}
tolerations: tolerations:

2
ci/helm-chart/values.yaml
View File

@ -33,6 +33,8 @@ podAnnotations: {}
podSecurityContext: {} podSecurityContext: {}
# fsGroup: 2000 # fsGroup: 2000
priorityClassName: ""
service: service:
type: ClusterIP type: ClusterIP
port: 8080 port: 8080

3
docs/MAINTAINING.md
View File

@ -164,7 +164,8 @@ If you're the current release manager, follow these steps:
### Publishing a release ### Publishing a release
1. Create a new branch called `v0.0.0` (replace 0s with actual version aka v4.5.1) 1. Create a new branch called `release/v0.0.0` (replace 0s with actual version aka v4.5.0)
1. If you don't do this, the `npm-brew` GitHub workflow will fail. It looks for the release artifacts under the branch pattern.
1. Run `yarn release:prep` and type in the new version (e.g., `3.8.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 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 `release-images` artifacts. You do not have to wait for this step to complete

3
package.json
View File

@ -83,7 +83,8 @@
"follow-redirects": "^1.14.8", "follow-redirects": "^1.14.8",
"node-fetch": "^2.6.7", "node-fetch": "^2.6.7",
"nanoid": "^3.1.31", "nanoid": "^3.1.31",
"minimist": "npm:minimist-lite@2.2.1" "minimist": "npm:minimist-lite@2.2.1",
"glob-parent": "^6.0.1"
}, },
"dependencies": { "dependencies": {
"@coder/logger": "1.1.16", "@coder/logger": "1.1.16",

1
src/node/wrapper.ts
View File

@ -322,7 +322,6 @@ export class ParentProcess extends Process {
env: { env: {
...process.env, ...process.env,
CODE_SERVER_PARENT_PID: process.pid.toString(), CODE_SERVER_PARENT_PID: process.pid.toString(),
NODE_OPTIONS: `--max-old-space-size=2048 ${process.env.NODE_OPTIONS || ""}`,
}, },
stdio: ["pipe", "pipe", "pipe", "ipc"], stdio: ["pipe", "pipe", "pipe", "ipc"],
}) })

10
yarn.lock
View File

@ -2032,12 +2032,12 @@ get-uri@3:
fs-extra "^8.1.0" fs-extra "^8.1.0"
ftp "^0.3.10" ftp "^0.3.10"
glob-parent@^5.1.0, glob-parent@^5.1.2: glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@^6.0.1:
version "5.1.2" version "6.0.2"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
dependencies: dependencies:
is-glob "^4.0.1" is-glob "^4.0.3"
glob@^7.1.3: glob@^7.1.3:
version "7.1.6" version "7.1.6"