mirror of
https://github.com/cdr/code-server.git
synced 2026-04-01 19:13:33 +02:00
Use CI build targets
The target we have been using has started throwing all sorts of errors during the build (even without any of our patches). After checking the VS Code repo I think these are the ones we should actually be using. They are way faster, too.
This commit is contained in:
parent
5ecc7aa83f
commit
01734df13b
3 changed files with 2 additions and 55 deletions
|
|
@ -112,9 +112,8 @@ EOF
|
|||
# this because we have an NPM package that could be installed on any platform.
|
||||
# The correct platform dependencies and scripts will be installed as part of
|
||||
# the post-install during `npm install` or when building a standalone release.
|
||||
node --max-old-space-size=16384 --optimize-for-size \
|
||||
./node_modules/gulp/bin/gulp.js \
|
||||
"vscode-reh-web-linux-x64${MINIFY:+-min}"
|
||||
npm run gulp core-ci
|
||||
npm run gulp "vscode-reh-web-linux-x64${MINIFY:+-min}-ci"
|
||||
|
||||
# Reset so if you develop after building you will not be stuck with the wrong
|
||||
# commit (the dev client will use `oss-dev` but the dev server will still use
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
Fix protected field error
|
||||
|
||||
The mangler is reporting this error:
|
||||
|
||||
WARN: 'setEditorVisible' from lib/vscode/src/vs/workbench/browser/parts/editor/editorPane.ts:160 became PUBLIC because of: lib/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditor.ts:304
|
||||
ERROR: Protected fields have been made PUBLIC. This hurts minification and is therefore not allowed. Review the WARN messages further above
|
||||
|
||||
No idea how VS Code is dealing with this in their own builds.
|
||||
|
||||
Additionally, in CI the build keeps getting terminated, possibly from running
|
||||
out of memory (there is no error message, it simply says it was canceled).
|
||||
|
||||
Index: code-server/lib/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditor.ts
|
||||
===================================================================
|
||||
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditor.ts
|
||||
+++ code-server/lib/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEditor.ts
|
||||
@@ -299,7 +299,7 @@ export class ChatDebugEditor extends Edi
|
||||
}
|
||||
}
|
||||
|
||||
- override setEditorVisible(visible: boolean): void {
|
||||
+ protected override setEditorVisible(visible: boolean): void {
|
||||
super.setEditorVisible(visible);
|
||||
if (visible) {
|
||||
this.telemetryService.publicLog2<{}, ChatDebugPanelOpenedClassification>('chatDebugPanelOpened');
|
||||
Index: code-server/lib/vscode/build/lib/mangle/index.ts
|
||||
===================================================================
|
||||
--- code-server.orig/lib/vscode/build/lib/mangle/index.ts
|
||||
+++ code-server/lib/vscode/build/lib/mangle/index.ts
|
||||
@@ -430,7 +430,7 @@ export class Mangler {
|
||||
this.config = config;
|
||||
|
||||
this.renameWorkerPool = workerpool.pool(path.join(import.meta.dirname, 'renameWorker.ts'), {
|
||||
- maxWorkers: 4,
|
||||
+ maxWorkers: 2,
|
||||
minWorkers: 'max'
|
||||
});
|
||||
}
|
||||
Index: code-server/lib/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.ts
|
||||
===================================================================
|
||||
--- code-server.orig/lib/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.ts
|
||||
+++ code-server/lib/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalConfirmationTool.ts
|
||||
@@ -58,7 +58,7 @@ export const ConfirmTerminalCommandToolD
|
||||
};
|
||||
|
||||
export class ConfirmTerminalCommandTool extends RunInTerminalTool {
|
||||
- override get _enableCommandLineSandboxRewriting() {
|
||||
+ protected override get _enableCommandLineSandboxRewriting() {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -22,4 +22,3 @@ clipboard.diff
|
|||
display-language.diff
|
||||
trusted-domains.diff
|
||||
signature-verification.diff
|
||||
fix-build.diff
|
||||
|
|
|
|||
Loading…
Reference in a new issue