From 5d1d56247d570e76127a5be672342cf485946d4c Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 13 Aug 2024 11:11:46 +0200 Subject: [PATCH 01/36] feat: prepare 1.93 (#1989) --- .github/workflows/insider-linux.yml | 16 ++-- .github/workflows/insider-macos.yml | 1 + .github/workflows/stable-linux.yml | 5 +- .nvmrc | 2 +- check_tags.sh | 33 ++++++++ insider.json | 4 +- package_linux_bin.sh | 6 +- .../client/{node16.patch => node16.patch.no} | 0 .../linux/{node16.patch => node16.patch.no} | 0 patches/linux/reh/node16.patch | 26 +++---- patches/report-issue.patch | 78 +++++++++++++++---- product.json | 21 ++--- 12 files changed, 141 insertions(+), 51 deletions(-) rename patches/linux/client/{node16.patch => node16.patch.no} (100%) rename patches/linux/{node16.patch => node16.patch.no} (100%) diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index 68b475b..0fddc81 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -143,13 +143,13 @@ jobs: include: - vscode_arch: x64 npm_arch: x64 - image: vscodium/vscodium-linux-build-agent:bionic-x64 + image: vscodium/vscodium-linux-build-agent:focal-x64 - vscode_arch: arm64 npm_arch: arm64 - image: vscodium/vscodium-linux-build-agent:bionic-arm64 + image: vscodium/vscodium-linux-build-agent:focal-arm64 - vscode_arch: armhf npm_arch: arm - image: vscodium/vscodium-linux-build-agent:bionic-armhf + image: vscodium/vscodium-linux-build-agent:focal-armhf - vscode_arch: riscv64 npm_arch: riscv64 image: vscodium/vscodium-linux-build-agent:focal-riscv64 @@ -180,8 +180,9 @@ jobs: - name: Check existing VSCodium tags/releases env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} CHECK_REH: 'no' + DISABLE_APPIMAGE: ${{ vars.DISABLE_INSIDER_APPIMAGE }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: ./check_tags.sh if: env.SHOULD_BUILD == 'yes' @@ -327,12 +328,13 @@ jobs: include: - vscode_arch: x64 npm_arch: x64 - - vscode_arch: arm64 - npm_arch: arm64 + # - vscode_arch: arm64 + # npm_arch: arm64 env: BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }} MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }} MS_TAG: ${{ needs.check.outputs.MS_TAG }} + OS_NAME: alpine RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }} SHOULD_BUILD: ${{ needs.check.outputs.SHOULD_BUILD }} SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }} @@ -428,7 +430,7 @@ jobs: platform: - amd64 - arm64 - if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_SNAP != 'yes' + if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_INSIDER_SNAP != 'yes' steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/insider-macos.yml b/.github/workflows/insider-macos.yml index 05f14e6..ba63fba 100644 --- a/.github/workflows/insider-macos.yml +++ b/.github/workflows/insider-macos.yml @@ -60,6 +60,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: '3.11' + if: env.VSCODE_ARCH == 'x64' - name: Clone VSCode repo env: diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml index 9f09e27..61591dc 100644 --- a/.github/workflows/stable-linux.yml +++ b/.github/workflows/stable-linux.yml @@ -180,7 +180,7 @@ jobs: - name: Check existing VSCodium tags/releases env: CHECK_REH: 'no' - DISABLE_APPIMAGE: ${{ vars.DISABLE_APPIMAGE }} + DISABLE_APPIMAGE: ${{ vars.DISABLE_STABLE_APPIMAGE }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: ./check_tags.sh if: env.SHOULD_BUILD == 'yes' @@ -333,6 +333,7 @@ jobs: BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }} MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }} MS_TAG: ${{ needs.check.outputs.MS_TAG }} + OS_NAME: alpine RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }} SHOULD_BUILD: ${{ needs.check.outputs.SHOULD_BUILD }} SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }} @@ -425,7 +426,7 @@ jobs: platform: - amd64 - arm64 - if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_SNAP != 'yes' + if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_STABLE_SNAP != 'yes' steps: - uses: actions/checkout@v3 diff --git a/.nvmrc b/.nvmrc index 7795cad..c61a3d7 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.12 +20.14 diff --git a/check_tags.sh b/check_tags.sh index 284c9dd..19047e4 100755 --- a/check_tags.sh +++ b/check_tags.sh @@ -402,6 +402,39 @@ elif [[ "${ASSETS}" != "null" ]]; then fi fi fi + + elif [[ "${OS_NAME}" == "alpine" ]]; then + + if [[ "${CHECK_ONLY_REH}" == "yes" ]]; then + if [[ -z $( contains "${APP_NAME_LC}-reh-alpine-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Alpine ${VSCODE_ARCH} because we have no REH archive" + export SHOULD_BUILD="yes" + else + echo "Already have the Alpine REH ${VSCODE_ARCH} archive" + export SHOULD_BUILD_REH="no" + fi + else + + # alpine-arm64 + if [[ "${VSCODE_ARCH}" == "arm64" || "${CHECK_ALL}" == "yes" ]]; then + if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-alpine-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Alpine arm64 because we have no REH archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_REH="no" + fi + fi + + # alpine-x64 + if [[ "${VSCODE_ARCH}" == "x64" || "${CHECK_ALL}" == "yes" ]]; then + if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-alpine-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Alpine x64 because we have no REH archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_REH="no" + fi + fi + fi fi else if [[ "${IS_SPEARHEAD}" == "yes" ]]; then diff --git a/insider.json b/insider.json index 4febaca..64c4f3f 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { - "tag": "1.92.0", - "commit": "97d1b933ada0ca69bea107f7a89e029991277ccc" + "tag": "1.93.0", + "commit": "b60fe002f59dbc364ba3af905cefd6575bfe717b" } diff --git a/package_linux_bin.sh b/package_linux_bin.sh index 090b71c..0175b27 100755 --- a/package_linux_bin.sh +++ b/package_linux_bin.sh @@ -26,7 +26,7 @@ if [[ "${VSCODE_ARCH}" == "riscv64" ]]; then export VSCODE_ELECTRON_REPO='riscv-forks/electron-riscv-releases' export ELECTRON_SKIP_BINARY_DOWNLOAD=1 export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 - ELECTRON_VERSION="30.1.2" + ELECTRON_VERSION="30.3.1" if [[ "${ELECTRON_VERSION}" != "$(yarn config get target)" ]]; then # Fail the pipeline if electron target doesn't match what is used. # Look for releases here if electron version used by vscode changed: @@ -34,8 +34,8 @@ if [[ "${VSCODE_ARCH}" == "riscv64" ]]; then echo "Electron RISC-V binary version doesn't match target electron version!" exit 1 fi - export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}.riscv2" - echo "871a049ae913a37664532e93e6d1c8dc2da6260e9297c90d6d525f79581948b8 *electron-v30.1.2-linux-riscv64.zip" >> build/checksums/electron.txt + export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}.riscv1" + echo "ad36c48a8b0e061fbdeda91ff2a4c9a2f39d016c8ba23c7b4ed1394c37b1503b *electron-v${ELECTRON_VERSION}-linux-riscv64.zip" >> build/checksums/electron.txt fi if [[ -d "../patches/linux/client/" ]]; then diff --git a/patches/linux/client/node16.patch b/patches/linux/client/node16.patch.no similarity index 100% rename from patches/linux/client/node16.patch rename to patches/linux/client/node16.patch.no diff --git a/patches/linux/node16.patch b/patches/linux/node16.patch.no similarity index 100% rename from patches/linux/node16.patch rename to patches/linux/node16.patch.no diff --git a/patches/linux/reh/node16.patch b/patches/linux/reh/node16.patch index 5dd3668..aefd9a8 100644 --- a/patches/linux/reh/node16.patch +++ b/patches/linux/reh/node16.patch @@ -1,8 +1,8 @@ diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js -index 7d58861..87f2632 100644 +index 560bdc1..9208fa0 100644 --- a/build/gulpfile.reh.js +++ b/build/gulpfile.reh.js -@@ -389,16 +389,2 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa +@@ -392,16 +392,2 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa - if (platform === 'linux' && process.env['VSCODE_NODE_GLIBC'] === '-glibc-2.17') { - result = es.merge(result, @@ -20,19 +20,19 @@ index 7d58861..87f2632 100644 - result = inlineMeta(result, { diff --git a/remote/package.json b/remote/package.json -index 48b849c..2df37e4 100644 +index 66c0414..63a94bf 100644 --- a/remote/package.json +++ b/remote/package.json -@@ -31,3 +31,3 @@ +@@ -32,3 +32,3 @@ "native-watchdog": "^1.4.1", -- "node-pty": "1.1.0-beta11", +- "node-pty": "1.1.0-beta20", + "node-pty": "1.1.0-beta4", "tas-client-umd": "0.2.0", diff --git a/remote/yarn.lock b/remote/yarn.lock -index 38f916a..d116ac9 100644 +index 3c6d1ff..32d0456 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock -@@ -439,2 +439,7 @@ ms@2.1.2: +@@ -444,2 +444,7 @@ ms@2.1.2: +nan@^2.17.0: + version "2.18.0" @@ -40,17 +40,17 @@ index 38f916a..d116ac9 100644 + integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w== + napi-build-utils@^1.0.1: -@@ -456,3 +461,3 @@ node-abi@^3.3.0: +@@ -461,3 +466,3 @@ node-abi@^3.3.0: -node-addon-api@7.1.0, node-addon-api@^7.1.0: +node-addon-api@7.1.0: version "7.1.0" -@@ -481,8 +486,8 @@ node-gyp-build@4.8.1, node-gyp-build@^4.3.0: +@@ -486,8 +491,8 @@ node-gyp-build@4.8.1, node-gyp-build@^4.3.0: --node-pty@1.1.0-beta11: -- version "1.1.0-beta11" -- resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta11.tgz#909d5dd8f9aa2a7857e7b632fd4d2d4768bdf69f" -- integrity sha512-vTjF+VrvSCfPDILUkIT+YrG1Fdn06/eBRS2fc9a3JzYAvknMB1Ip8aoJhxl8hNpjWAbprmCEiV91mlfNpCD+GQ== +-node-pty@1.1.0-beta20: +- version "1.1.0-beta20" +- resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta20.tgz#bd723d3a36c5770d244d847e123da4a004fd0fa2" +- integrity sha512-tCOLI5dEhoV75CVaT9pLuZjdx5asJ2DPEA3QtHE9sNYUf6ELXfy0SrlUzFilYcDzkhidBDrPWY26SdmlTaEjyw== +node-pty@1.1.0-beta4: + version "1.1.0-beta4" + resolved "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta4.tgz#ee74d909c9f422ffc7f675e1092529673f8906ec" diff --git a/patches/report-issue.patch b/patches/report-issue.patch index c970e56..e579081 100644 --- a/patches/report-issue.patch +++ b/patches/report-issue.patch @@ -7,19 +7,16 @@ index 87839a6..49727fc 100644 -- VS Code version: \`${this._productService.version}\`\n\n${message}`); +- VSCodium version: \`${this._productService.version}\`\n\n${message}`); -diff --git a/src/vs/workbench/contrib/issue/browser/issue.ts b/src/vs/workbench/contrib/issue/browser/issue.ts -index 79e4485..33f09a4 100644 ---- a/src/vs/workbench/contrib/issue/browser/issue.ts -+++ b/src/vs/workbench/contrib/issue/browser/issue.ts -@@ -451,5 +451,5 @@ export class BaseIssueReporterService extends Disposable { - -- public searchVSCodeIssues(title: string, issueDescription?: string): void { -+ public searchVSCodeIssues(title: string, _issueDescription?: string): void { +diff --git a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts +index ec21ac3..89fabe0 100644 +--- a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts ++++ b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts +@@ -630,3 +630,3 @@ export class BaseIssueReporterService extends Disposable { if (title) { - this.searchDuplicates(title, issueDescription); + this.searchGitHub('VSCodium/vscodium', title); } else { -@@ -545,33 +545,2 @@ export class BaseIssueReporterService extends Disposable { +@@ -722,33 +722,2 @@ export class BaseIssueReporterService extends Disposable { - @debounce(300) - private searchDuplicates(title: string, body?: string): void { @@ -53,23 +50,23 @@ index 79e4485..33f09a4 100644 - } - private displaySearchResults(results: SearchResult[]) { -@@ -667,4 +636,4 @@ export class BaseIssueReporterService extends Disposable { +@@ -844,4 +813,4 @@ export class BaseIssueReporterService extends Disposable { sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true)); - sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "Visual Studio Code"), false)); - sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VS Code extension"), false)); + sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "VSCodium"), false)); + sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VSCodium extension"), false)); if (this.product.reportMarketplaceIssueUrl) { -@@ -728,3 +697,3 @@ export class BaseIssueReporterService extends Disposable { +@@ -905,3 +874,3 @@ export class BaseIssueReporterService extends Disposable { hide(descriptionTextArea); - reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VS Code")); + reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VSCodium")); reset(descriptionSubtitle, localize('elsewhereDescription', "The '{0}' extension prefers to use an external issue reporter. To be taken to that issue reporting experience, click the button below.", selectedExtension.displayName)); diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts -index f8274d9..15fcc8b 100644 +index 4394874..a9c3f57 100644 --- a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts +++ b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts -@@ -92,3 +92,3 @@ ${this._data.issueDescription} +@@ -93,3 +93,3 @@ ${this._data.issueDescription} ${this.getExtensionVersion()} -VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion} +VSCodium version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion} @@ -88,3 +85,58 @@ index 195857e..68163c0 100644 - 'Before you report an issue here please review the guidance we provide.' + 'Before you report an issue here please review the guidance we provide.' ); +diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts +index b923388..043a8ac 100644 +--- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts ++++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts +@@ -555,3 +555,3 @@ export class IssueReporter extends Disposable { + if (title) { +- this.searchDuplicates(title, issueDescription); ++ this.searchGitHub('VSCodium/vscodium', title); + } else { +@@ -647,33 +647,2 @@ export class IssueReporter extends Disposable { + +- @debounce(300) +- private searchDuplicates(title: string, body?: string): void { +- const url = 'https://vscode-probot.westus.cloudapp.azure.com:7890/duplicate_candidates'; +- const init = { +- method: 'POST', +- body: JSON.stringify({ +- title, +- body +- }), +- headers: new Headers({ +- 'Content-Type': 'application/json' +- }) +- }; +- +- fetch(url, init).then((response) => { +- response.json().then(result => { +- this.clearSearchResults(); +- +- if (result && result.candidates) { +- this.displaySearchResults(result.candidates); +- } else { +- throw new Error('Unexpected response, no candidates property'); +- } +- }).catch(_ => { +- // Ignore +- }); +- }).catch(_ => { +- // Ignore +- }); +- } +- + private displaySearchResults(results: SearchResult[]) { +@@ -769,4 +738,4 @@ export class IssueReporter extends Disposable { + sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true)); +- sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "Visual Studio Code"), false)); +- sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VS Code extension"), false)); ++ sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "VSCodium"), false)); ++ sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VSCodium extension"), false)); + if (this.configuration.product.reportMarketplaceIssueUrl) { +@@ -830,3 +799,3 @@ export class IssueReporter extends Disposable { + hide(descriptionTextArea); +- reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VS Code")); ++ reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VSCodium")); + reset(descriptionSubtitle, localize('elsewhereDescription', "The '{0}' extension prefers to use an external issue reporter. To be taken to that issue reporting experience, click the button below.", selectedExtension.displayName)); diff --git a/product.json b/product.json index b18b2ef..a3b920b 100644 --- a/product.json +++ b/product.json @@ -86,8 +86,7 @@ "quickPickItemTooltip", "terminalDataWriteEvent", "terminalExecuteCommandEvent", - "contribIssueReporter", - "terminalShellIntegration" + "contribIssueReporter" ], "ms-dotnettools.dotnet-interactive-vscode": [ "notebookMessaging" @@ -200,11 +199,14 @@ "treeViewMarkdownMessage" ], "GitHub.copilot": [ - "authGetSessions", - "inlineCompletionsAdditions" + "inlineCompletionsAdditions", + "interactive", + "terminalDataWriteEvent" ], "GitHub.copilot-nightly": [ - "inlineCompletionsAdditions" + "inlineCompletionsAdditions", + "interactive", + "terminalDataWriteEvent" ], "GitHub.copilot-chat": [ "interactive", @@ -212,11 +214,11 @@ "terminalExecuteCommandEvent", "terminalSelection", "terminalQuickFixProvider", + "chatProvider", "chatParticipantAdditions", "defaultChatParticipant", "embeddings", "chatVariableResolver", - "chatProvider", "mappedEditsProvider", "aiRelatedInformation", "codeActionAI", @@ -231,7 +233,6 @@ "newSymbolNamesProvider", "findFiles2", "extensionsAny", - "authGetSessions", "authLearnMore", "testObserver", "aiTextSearchProvider", @@ -254,6 +255,9 @@ "textSearchProvider", "timeline" ], + "GitHub.copilot-nes": [ + "inlineEdit" + ], "ms-python.gather": [ "notebookCellExecutionState" ], @@ -294,9 +298,6 @@ "ms-azuretools.vscode-azureappservice": [ "terminalDataWriteEvent" ], - "ms-azuretools.vscode-azureresourcegroups": [ - "authGetSessions" - ], "ms-azuretools.vscode-azure-github-copilot": [ "chatParticipantAdditions", "embeddings", From 98747a7251708843e22550c6c69b04c0bea31479 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 13 Aug 2024 12:11:14 +0200 Subject: [PATCH 02/36] ci(insider): use insider branch for dispatch [skip ci] --- .github/workflows/insider-spearhead.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/insider-spearhead.yml b/.github/workflows/insider-spearhead.yml index 185f5a8..4514163 100644 --- a/.github/workflows/insider-spearhead.yml +++ b/.github/workflows/insider-spearhead.yml @@ -78,4 +78,10 @@ jobs: uses: peter-evans/repository-dispatch@v3 with: event-type: 'insider' + client-payload: |- + { + "repo": { + "branch": "insider" + } + } if: github.event.inputs.dont_dispatch != 'true' && (env.SHOULD_BUILD == 'yes' || github.event.inputs.force_dispatch == 'true') From c6f099228b10d856b0c3a3c6228c54d582b97009 Mon Sep 17 00:00:00 2001 From: VSCodium CI Date: Wed, 14 Aug 2024 07:16:42 +0000 Subject: [PATCH 03/36] build(insider): update to commit 922413f --- insider.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/insider.json b/insider.json index 64c4f3f..29d7638 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { "tag": "1.93.0", - "commit": "b60fe002f59dbc364ba3af905cefd6575bfe717b" + "commit": "922413f6d97e16c05b565398f33d95c306b1ceb7" } From 53ca6461621d4b8d748f9eb8112eca76cd4beaa7 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Wed, 14 Aug 2024 17:04:41 +0200 Subject: [PATCH 04/36] feat: add reh-web (#1993) --- .github/workflows/insider-linux.yml | 8 ++- .github/workflows/stable-linux.yml | 8 ++- build.sh | 10 ++-- check_tags.sh | 91 +++++++++++++++++++++++++++++ package_linux_reh.sh | 34 ++++++++--- prepare_assets.sh | 7 +++ 6 files changed, 139 insertions(+), 19 deletions(-) diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index 0fddc81..3bf6a7f 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -113,6 +113,7 @@ jobs: - name: Build env: SHOULD_BUILD_REH: 'no' + SHOULD_BUILD_REH_WEB: 'no' run: ./build.sh if: env.SHOULD_BUILD == 'yes' @@ -206,6 +207,7 @@ jobs: - name: Prepare assets env: SHOULD_BUILD_REH: 'no' + SHOULD_BUILD_REH_WEB: 'no' run: ./prepare_assets.sh if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') @@ -293,21 +295,21 @@ jobs: uses: actions/download-artifact@v3 with: name: vscode - if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true' + if: env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true' - name: Build env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} npm_config_arch: ${{ matrix.npm_arch }} run: ./package_linux_reh.sh - if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true' + if: env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true' - name: Release env: GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }} GITHUB_USERNAME: ${{ github.repository_owner }} run: ./release.sh - if: env.SHOULD_BUILD_REH != 'no' && env.SHOULD_DEPLOY == 'yes' + if: (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no') && env.SHOULD_DEPLOY == 'yes' - name: Upload assets uses: actions/upload-artifact@v4 diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml index 61591dc..58c7cce 100644 --- a/.github/workflows/stable-linux.yml +++ b/.github/workflows/stable-linux.yml @@ -112,6 +112,7 @@ jobs: - name: Build env: SHOULD_BUILD_REH: 'no' + SHOULD_BUILD_REH_WEB: 'no' run: ./build.sh if: env.SHOULD_BUILD == 'yes' @@ -205,6 +206,7 @@ jobs: - name: Prepare assets env: SHOULD_BUILD_REH: 'no' + SHOULD_BUILD_REH_WEB: 'no' run: ./prepare_assets.sh if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') @@ -292,21 +294,21 @@ jobs: uses: actions/download-artifact@v3 with: name: vscode - if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true' + if: env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true' - name: Build env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} npm_config_arch: ${{ matrix.npm_arch }} run: ./package_linux_reh.sh - if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true' + if: env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true' - name: Release env: GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }} GITHUB_USERNAME: ${{ github.repository_owner }} run: ./release.sh - if: env.SHOULD_BUILD_REH != 'no' && env.SHOULD_DEPLOY == 'yes' + if: (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no') && env.SHOULD_DEPLOY == 'yes' - name: Upload assets uses: actions/upload-artifact@v4 diff --git a/build.sh b/build.sh index c31f612..919a6a5 100755 --- a/build.sh +++ b/build.sh @@ -35,6 +35,7 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then if [[ "${VSCODE_ARCH}" != "ia32" && "${VSCODE_ARCH}" != "x64" ]]; then SHOULD_BUILD_REH="no" + SHOULD_BUILD_REH_WEB="no" fi VSCODE_PLATFORM="win32" @@ -50,13 +51,14 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then fi if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then - if [[ "${OS_NAME}" == "linux" ]]; then - export VSCODE_NODE_GLIBC='-glibc-2.17' - fi - yarn gulp minify-vscode-reh yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci" fi + if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then + yarn gulp minify-vscode-reh-web + yarn gulp "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci" + fi + cd .. fi diff --git a/check_tags.sh b/check_tags.sh index 19047e4..70b914d 100755 --- a/check_tags.sh +++ b/check_tags.sh @@ -98,6 +98,13 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH="no" fi + if [[ -z $( contains "${APP_NAME_LC}-reh-web-darwin-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on MacOS because we have no REH-web archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_REH_WEB="no" + fi + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the MacOS builds" fi @@ -127,6 +134,7 @@ elif [[ "${ASSETS}" != "null" ]]; then fi export SHOULD_BUILD_REH="no" + export SHOULD_BUILD_REH_WEB="no" if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the Windows arm64 builds" @@ -176,6 +184,13 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH="no" fi + if [[ -z $( contains "${APP_NAME_LC}-reh-web-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Windows ia32 because we have no REH-web archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_REH_WEB="no" + fi + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the Windows ia32 builds" fi @@ -224,6 +239,13 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH="no" fi + if [[ -z $( contains "${APP_NAME_LC}-reh-web-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Windows x64 because we have no REH-web archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_REH_WEB="no" + fi + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the Windows x64 builds" fi @@ -231,6 +253,7 @@ elif [[ "${ASSETS}" != "null" ]]; then elif [[ "${OS_NAME}" == "linux" ]]; then if [[ "${CHECK_ONLY_REH}" == "yes" ]]; then + if [[ -z $( contains "${APP_NAME_LC}-reh-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then echo "Building on Linux ${VSCODE_ARCH} because we have no REH archive" export SHOULD_BUILD="yes" @@ -238,6 +261,15 @@ elif [[ "${ASSETS}" != "null" ]]; then echo "Already have the Linux REH ${VSCODE_ARCH} archive" export SHOULD_BUILD_REH="no" fi + + if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Linux ${VSCODE_ARCH} because we have no REH-web archive" + export SHOULD_BUILD="yes" + else + echo "Already have the Linux REH-web ${VSCODE_ARCH} archive" + export SHOULD_BUILD_REH_WEB="no" + fi + else # linux-arm64 @@ -270,6 +302,13 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH="no" fi + if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Linux arm64 because we have no REH-web archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_REH_WEB="no" + fi + export SHOULD_BUILD_APPIMAGE="no" if [[ "${SHOULD_BUILD}" != "yes" ]]; then @@ -307,6 +346,13 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH="no" fi + if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Linux arm because we have no REH-web archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_REH_WEB="no" + fi + export SHOULD_BUILD_APPIMAGE="no" if [[ "${SHOULD_BUILD}" != "yes" ]]; then @@ -328,6 +374,13 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH="no" fi + if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Linux PowerPC64LE because we have no REH-web archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_REH_WEB="no" + fi + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the Linux PowerPC64LE builds" fi @@ -353,6 +406,13 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH="no" fi + if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Linux RISC-V 64 because we have no REH-web archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_REH_WEB="no" + fi + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the Linux riscv64 builds" fi @@ -397,6 +457,13 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH="no" fi + if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Linux x64 because we have no REH-web archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_REH_WEB="no" + fi + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the Linux x64 builds" fi @@ -413,6 +480,14 @@ elif [[ "${ASSETS}" != "null" ]]; then echo "Already have the Alpine REH ${VSCODE_ARCH} archive" export SHOULD_BUILD_REH="no" fi + + if [[ -z $( contains "${APP_NAME_LC}-reh-web-alpine-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Alpine ${VSCODE_ARCH} because we have no REH-web archive" + export SHOULD_BUILD="yes" + else + echo "Already have the Alpine REH-web ${VSCODE_ARCH} archive" + export SHOULD_BUILD_REH_WEB="no" + fi else # alpine-arm64 @@ -423,6 +498,13 @@ elif [[ "${ASSETS}" != "null" ]]; then else export SHOULD_BUILD_REH="no" fi + + if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-alpine-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Alpine arm64 because we have no REH-web archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_REH_WEB="no" + fi fi # alpine-x64 @@ -433,6 +515,13 @@ elif [[ "${ASSETS}" != "null" ]]; then else export SHOULD_BUILD_REH="no" fi + + if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-alpine-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Alpine x64 because we have no REH-web archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_REH_WEB="no" + fi fi fi fi @@ -454,6 +543,7 @@ else elif [[ "${OS_NAME}" == "windows" ]]; then if [[ "${VSCODE_ARCH}" == "arm64" ]]; then export SHOULD_BUILD_REH="no" + export SHOULD_BUILD_REH_WEB="no" fi fi @@ -471,6 +561,7 @@ echo "SHOULD_BUILD_EXE_USR=${SHOULD_BUILD_EXE_USR}" >> "${GITHUB_ENV}" echo "SHOULD_BUILD_MSI=${SHOULD_BUILD_MSI}" >> "${GITHUB_ENV}" echo "SHOULD_BUILD_MSI_NOUP=${SHOULD_BUILD_MSI_NOUP}" >> "${GITHUB_ENV}" echo "SHOULD_BUILD_REH=${SHOULD_BUILD_REH}" >> "${GITHUB_ENV}" +echo "SHOULD_BUILD_REH_WEB=${SHOULD_BUILD_REH_WEB}" >> "${GITHUB_ENV}" echo "SHOULD_BUILD_RPM=${SHOULD_BUILD_RPM}" >> "${GITHUB_ENV}" echo "SHOULD_BUILD_TAR=${SHOULD_BUILD_TAR}" >> "${GITHUB_ENV}" echo "SHOULD_BUILD_ZIP=${SHOULD_BUILD_ZIP}" >> "${GITHUB_ENV}" diff --git a/package_linux_reh.sh b/package_linux_reh.sh index 20970bb..86b1d49 100755 --- a/package_linux_reh.sh +++ b/package_linux_reh.sh @@ -7,6 +7,10 @@ if [[ "${CI_BUILD}" == "no" ]]; then exit 1 fi +APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )" + +mkdir -p assets + tar -xzf ./vscode.tar.gz cd vscode || { echo "'vscode' dir not found"; exit 1; } @@ -96,20 +100,32 @@ node build/azure-pipelines/distro/mixin-npm export VSCODE_NODE_GLIBC="-glibc-${GLIBC_VERSION}" -yarn gulp minify-vscode-reh -yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci" +if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then + echo "Building REH" + yarn gulp minify-vscode-reh + yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci" -EXPECTED_GLIBC_VERSION="${GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh + EXPECTED_GLIBC_VERSION="${GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh -cd .. + echo "Archiving REH" + pushd "../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" + tar czf "../assets/${APP_NAME_LC}-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" . + popd +fi -APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )" +if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then + echo "Building REH-web" + yarn gulp minify-vscode-reh-web + yarn gulp "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci" -mkdir -p assets + EXPECTED_GLIBC_VERSION="${GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh + + echo "Archiving REH-web" + pushd "../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}" + tar czf "../assets/${APP_NAME_LC}-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" . + popd +fi -echo "Building and moving REH" -cd "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" -tar czf "../assets/${APP_NAME_LC}-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" . cd .. npm install -g checksum diff --git a/prepare_assets.sh b/prepare_assets.sh index 3ab7c1d..fc3eb91 100755 --- a/prepare_assets.sh +++ b/prepare_assets.sh @@ -219,6 +219,13 @@ if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then cd .. fi +if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then + echo "Building and moving REH-web" + cd "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}" + tar czf "../assets/${APP_NAME_LC}-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" . + cd .. +fi + cd assets for FILE in *; do From f10855ca77cd72dc09c14d2ec14d87caa74d6c08 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Sun, 18 Aug 2024 12:01:40 +0200 Subject: [PATCH 05/36] fix(linux): update patch for reh --- .github/workflows/insider-spearhead.yml | 6 ------ patches/linux/reh/node16.patch | 14 +++++++------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/insider-spearhead.yml b/.github/workflows/insider-spearhead.yml index 4514163..185f5a8 100644 --- a/.github/workflows/insider-spearhead.yml +++ b/.github/workflows/insider-spearhead.yml @@ -78,10 +78,4 @@ jobs: uses: peter-evans/repository-dispatch@v3 with: event-type: 'insider' - client-payload: |- - { - "repo": { - "branch": "insider" - } - } if: github.event.inputs.dont_dispatch != 'true' && (env.SHOULD_BUILD == 'yes' || github.event.inputs.force_dispatch == 'true') diff --git a/patches/linux/reh/node16.patch b/patches/linux/reh/node16.patch index aefd9a8..c5336b5 100644 --- a/patches/linux/reh/node16.patch +++ b/patches/linux/reh/node16.patch @@ -20,16 +20,16 @@ index 560bdc1..9208fa0 100644 - result = inlineMeta(result, { diff --git a/remote/package.json b/remote/package.json -index 66c0414..63a94bf 100644 +index aa24bf8..63a94bf 100644 --- a/remote/package.json +++ b/remote/package.json @@ -32,3 +32,3 @@ "native-watchdog": "^1.4.1", -- "node-pty": "1.1.0-beta20", +- "node-pty": "1.1.0-beta21", + "node-pty": "1.1.0-beta4", "tas-client-umd": "0.2.0", diff --git a/remote/yarn.lock b/remote/yarn.lock -index 3c6d1ff..32d0456 100644 +index 2478846..32d0456 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -444,2 +444,7 @@ ms@2.1.2: @@ -47,10 +47,10 @@ index 3c6d1ff..32d0456 100644 version "7.1.0" @@ -486,8 +491,8 @@ node-gyp-build@4.8.1, node-gyp-build@^4.3.0: --node-pty@1.1.0-beta20: -- version "1.1.0-beta20" -- resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta20.tgz#bd723d3a36c5770d244d847e123da4a004fd0fa2" -- integrity sha512-tCOLI5dEhoV75CVaT9pLuZjdx5asJ2DPEA3QtHE9sNYUf6ELXfy0SrlUzFilYcDzkhidBDrPWY26SdmlTaEjyw== +-node-pty@1.1.0-beta21: +- version "1.1.0-beta21" +- resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta21.tgz#d75c1dfe4ff2c173459c974df72e91a4eae6dc52" +- integrity sha512-FYpnY9g8qMQLTpqyeY9NVli6YfCWwvG6v6gmaDBbPjlc1VMp/+Zivq0SStDrRr1aciGnFCZzpL0BzdMnmbDnAw== +node-pty@1.1.0-beta4: + version "1.1.0-beta4" + resolved "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta4.tgz#ee74d909c9f422ffc7f675e1092529673f8906ec" From 043f1c4c60fcecf12f53c1fc836babe50125d3a7 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Wed, 21 Aug 2024 15:39:29 +0200 Subject: [PATCH 06/36] feat(1.93): update patches (#2001) --- insider.json | 2 +- patches/brand.patch | 232 +++++++++++++++------- patches/build-version.patch | 32 +-- patches/linux/client/disable-remote.patch | 12 +- product.json | 18 +- 5 files changed, 196 insertions(+), 100 deletions(-) diff --git a/insider.json b/insider.json index 29d7638..0e65874 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { "tag": "1.93.0", - "commit": "922413f6d97e16c05b565398f33d95c306b1ceb7" + "commit": "e1db90f81da28c0994b5d50dc2b51e964359e62d" } diff --git a/patches/brand.patch b/patches/brand.patch index ee4ed43..da83d6e 100644 --- a/patches/brand.patch +++ b/patches/brand.patch @@ -282,7 +282,7 @@ index af6c9d8..7057b54 100644 + "json.tracing.desc": "Traces the communication between VSCodium and the JSON language server.", "json.colorDecorators.enable.desc": "Enables or disables color decorators", diff --git a/extensions/markdown-language-features/package.nls.json b/extensions/markdown-language-features/package.nls.json -index 3549ec5..8460eb1 100644 +index da567b4..37e3f7d 100644 --- a/extensions/markdown-language-features/package.nls.json +++ b/extensions/markdown-language-features/package.nls.json @@ -21,3 +21,3 @@ @@ -290,6 +290,11 @@ index 3549ec5..8460eb1 100644 - "markdown.trace.server.desc": "Traces the communication between VS Code and the Markdown language server.", + "markdown.trace.server.desc": "Traces the communication between VSCodium and the Markdown language server.", "markdown.server.log.desc": "Controls the logging level of the Markdown language server.", +@@ -75,3 +75,3 @@ + "comment": [ +- "This setting is use the user drops or pastes image data into the editor. In this case, VS Code automatically creates a new image file in the workspace containing the dropped/pasted image.", ++ "This setting is use the user drops or pastes image data into the editor. In this case, VSCodium automatically creates a new image file in the workspace containing the dropped/pasted image.", + "It's easier to explain this setting with an example. For example, let's say the setting value was:", diff --git a/extensions/media-preview/package.nls.json b/extensions/media-preview/package.nls.json index c45e1e2..d8408d8 100644 --- a/extensions/media-preview/package.nls.json @@ -354,7 +359,7 @@ index b18b340..ca2eb2d 100644 + "comment": "The simpler (?<=\\bProcess\\.|\\bCommandLine\\.) breaks VSCodium / Atom, see https://github.com/textmate/swift.tmbundle/issues/29", "name": "support.variable.swift", diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json -index cba2400..039d20d 100644 +index 3067026..d5ef364 100644 --- a/extensions/typescript-language-features/package.nls.json +++ b/extensions/typescript-language-features/package.nls.json @@ -75,4 +75,4 @@ @@ -377,7 +382,7 @@ index cba2400..039d20d 100644 - "configuration.tsserver.useVsCodeWatcher": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", + "configuration.tsserver.useVsCodeWatcher": "Use VSCodium's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", "configuration.tsserver.watchOptions": "Configure which watching strategies should be used to keep track of files and directories.", -@@ -218,6 +218,6 @@ +@@ -233,6 +233,6 @@ "configuration.suggest.objectLiteralMethodSnippets.enabled": "Enable/disable snippet completions for methods in object literals.", - "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VS Code is running in a trusted context.", + "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VSCodium is running in a trusted context.", @@ -386,7 +391,7 @@ index cba2400..039d20d 100644 - "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.", + "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VSCodium to detect a Node installation.", "configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.6+.", -@@ -232,6 +232,6 @@ +@@ -247,6 +247,6 @@ "walkthroughs.nodejsWelcome.debugJsFile.title": "Run and Debug your JavaScript", - "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VS Code's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)", + "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VSCodium's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)", @@ -423,26 +428,26 @@ index 04f08a1..2b2b1bb 100644 + vscode.l10n.t("Please open a folder in VSCodium to use a TypeScript or JavaScript project")); return; diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts -index b61153b..660fa7d 100644 +index 2d3ea9e..a19481a 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts -@@ -640,3 +640,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType +@@ -663,3 +663,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType prompt = vscode.window.showErrorMessage( - vscode.l10n.t("The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList)); + vscode.l10n.t("The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList)); } else { -@@ -661,3 +661,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType +@@ -684,3 +684,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType prompt = vscode.window.showWarningMessage( - vscode.l10n.t("The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList)); + vscode.l10n.t("The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList)); } else { -@@ -675,3 +675,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType +@@ -698,3 +698,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType prompt = vscode.window.showWarningMessage( - vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList)); + vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList)); } else { diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json -index 61828a7..1757d01 100644 +index 8a1032f..1041fd2 100644 --- a/extensions/vscode-api-tests/package.json +++ b/extensions/vscode-api-tests/package.json @@ -2,3 +2,3 @@ @@ -520,10 +525,10 @@ index fa001b5..13abac2 100644 + throw Error(`Failed to download and unzip VSCodium ${quality} - ${commit}`); } diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts -index ca405dd..42d1f6b 100644 +index ca47f74..a55be4c 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts -@@ -532,3 +532,3 @@ export class CodeApplication extends Disposable { +@@ -534,3 +534,3 @@ export class CodeApplication extends Disposable { async startup(): Promise { - this.logService.debug('Starting VS Code'); + this.logService.debug('Starting VSCodium'); @@ -570,6 +575,15 @@ index 75ab2ba..8c06c7e 100644 - throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name)); + throw new Error(nls.localize('restartCode', "Please restart VSCodium before reinstalling {0}.", this.manifest.displayName || this.manifest.name)); } +diff --git a/src/vs/platform/extensions/common/extensionValidator.ts b/src/vs/platform/extensions/common/extensionValidator.ts +index 5fae8b4..73b70cc 100644 +--- a/src/vs/platform/extensions/common/extensionValidator.ts ++++ b/src/vs/platform/extensions/common/extensionValidator.ts +@@ -371,3 +371,3 @@ export function areApiProposalsCompatible(apiProposals: string[], arg1?: any): b + if (existingProposal.version !== version) { +- incompatibleNotices.push(nls.localize('apiProposalMismatch', "Extension is using an API proposal '{0}' that is not compatible with the current version of VS Code.", proposalName)); ++ incompatibleNotices.push(nls.localize('apiProposalMismatch', "Extension is using an API proposal '{0}' that is not compatible with the current version of VSCodium.", proposalName)); + } diff --git a/src/vs/platform/externalTerminal/node/externalTerminalService.ts b/src/vs/platform/externalTerminal/node/externalTerminalService.ts index 9f85b14..57d913c 100644 --- a/src/vs/platform/externalTerminal/node/externalTerminalService.ts @@ -641,10 +655,10 @@ index b28bd28..f8255a6 100644 + description: localize({ key: 'vscode.extension.contributes.views.containers.id', comment: ['Contribution refers to those that an extension contributes to VSCodium through an extension/contribution point. '] }, "Unique id used to identify the container in which views can be contributed using 'views' contribution point"), type: 'string', diff --git a/src/vs/workbench/api/common/extHostApiCommands.ts b/src/vs/workbench/api/common/extHostApiCommands.ts -index 5535cec..f4b04fe 100644 +index 6384178..01393f9 100644 --- a/src/vs/workbench/api/common/extHostApiCommands.ts +++ b/src/vs/workbench/api/common/extHostApiCommands.ts -@@ -413,3 +413,3 @@ const newCommands: ApiCommand[] = [ +@@ -443,3 +443,3 @@ const newCommands: ApiCommand[] = [ ApiCommandArgument.Uri.with('resource', 'Resource to open'), - ApiCommandArgument.String.with('viewId', 'Custom editor view id. This should be the viewType string for custom editors or the notebookType string for notebooks. Use \'default\' to use VS Code\'s default text editor'), + ApiCommandArgument.String.with('viewId', 'Custom editor view id. This should be the viewType string for custom editors or the notebookType string for notebooks. Use \'default\' to use VSCodium\'s default text editor'), @@ -668,7 +682,7 @@ index 49a2f01..e39520d 100644 + test('Opening a notebook results in VSCodium firing the event onDidChangeActiveNotebookEditor twice #118470', function () { let count = 0; diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts -index d83ac06..4387b88 100644 +index bf16298..e51bef1 100644 --- a/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts @@ -652,3 +652,3 @@ const registry = Registry.as(ConfigurationExtensions.Con @@ -676,11 +690,20 @@ index d83ac06..4387b88 100644 - localize('appName', "`${appName}`: e.g. VS Code."), + localize('appName', "`${appName}`: e.g. VSCodium."), localize('remoteName', "`${remoteName}`: e.g. SSH"), +diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts b/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts +index 5d3949a..28f3fa6 100644 +--- a/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts ++++ b/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts +@@ -52,3 +52,3 @@ export class AccessibilityStatus extends Disposable implements IWorkbenchContrib + Severity.Info, +- localize('screenReaderDetectedExplanation.question', "Are you using a screen reader to operate VS Code?"), ++ localize('screenReaderDetectedExplanation.question', "Are you using a screen reader to operate VSCodium?"), + [{ diff --git a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts -index 4233162..9bd6599 100644 +index 8e1fc26..c9026b2 100644 --- a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts +++ b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts -@@ -153,3 +153,3 @@ export class AdapterManager extends Disposable implements IAdapterManager { +@@ -176,3 +176,3 @@ export class AdapterManager extends Disposable implements IAdapterManager { type: 'number', - description: nls.localize('debugServer', "For debug extension development only: if a port is specified VS Code tries to connect to a debug adapter running in server mode"), + description: nls.localize('debugServer', "For debug extension development only: if a port is specified VSCodium tries to connect to a debug adapter running in server mode"), @@ -715,7 +738,7 @@ index 60aa8d8..ed2fe8f 100644 + localize('InstallVSIXAction.successReload', "Completed installing extension from VSIX. Please reload VSCodium to enable it."), [{ diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts -index 5a58533..9536088 100644 +index c5d00d3..4f114d4 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts @@ -105,3 +105,3 @@ export class PromptExtensionInstallFailureAction extends Action { @@ -749,15 +772,15 @@ index 5a58533..9536088 100644 + const message = requireReload ? localize('ReinstallAction.successReload', "Please reload VSCodium to complete reinstalling the extension {0}.", extension.identifier.id) : localize('ReinstallAction.success', "Reinstalling the extension {0} is completed.", extension.identifier.id); diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -index d691d2b..2dfdc1e 100644 +index 584743f..696f927 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -436,3 +436,3 @@ export class Extension implements IExtension { +@@ -451,3 +451,3 @@ export class Extension implements IExtension { return Promise.resolve(`# ${this.displayName || this.name} -**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled. +**Notice:** This extension is bundled with VSCodium. It can be disabled but not uninstalled. ## Features -@@ -474,3 +474,3 @@ ${this.description} +@@ -489,3 +489,3 @@ ${this.description} if (this.type === ExtensionType.System) { - return Promise.resolve(`Please check the [VS Code Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`); + return Promise.resolve(`Please check the [VSCodium Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`); @@ -811,6 +834,15 @@ index 4b8d4c2..cfdbb92 100644 - patternErrorMessage: localize('vscode.extension.contributes.localizations.translations.id.pattern', "Id should be `vscode` or in format `publisherId.extensionName` for translating VS code or an extension respectively.") + patternErrorMessage: localize('vscode.extension.contributes.localizations.translations.id.pattern', "Id should be `vscode` or in format `publisherId.extensionName` for translating VSCodium or an extension respectively.") }, +diff --git a/src/vs/workbench/contrib/localization/common/localizationsActions.ts b/src/vs/workbench/contrib/localization/common/localizationsActions.ts +index 7f2f1f1..dc6ff2d 100644 +--- a/src/vs/workbench/contrib/localization/common/localizationsActions.ts ++++ b/src/vs/workbench/contrib/localization/common/localizationsActions.ts +@@ -26,3 +26,3 @@ export class ConfigureDisplayLanguageAction extends Action2 { + metadata: { +- description: localize2('configureLocaleDescription', "Changes the locale of VS Code based on installed language packs. Common languages include French, Chinese, Spanish, Japanese, German, Korean, and more.") ++ description: localize2('configureLocaleDescription', "Changes the locale of VSCodium based on installed language packs. Common languages include French, Chinese, Spanish, Japanese, German, Korean, and more.") + } diff --git a/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts b/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts index 50ed5aa..a28e184 100644 --- a/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts @@ -823,28 +855,19 @@ index 50ed5aa..a28e184 100644 + `// ${nls.localize('doc', 'Open VSCodium and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.')}`, ``, diff --git a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts -index 0f75017..2736bfe 100644 +index e65b86b..a8a5069 100644 --- a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts +++ b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts -@@ -559,3 +559,3 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo +@@ -560,3 +560,3 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo }, - "You can now access this machine anywhere via the secure tunnel [{0}](command:{4}). To connect via a different machine, use the generated [{1}]({2}) link or use the [{6}]({7}) extension in the desktop or web. You can [configure](command:{3}) or [turn off](command:{5}) this access via the VS Code Accounts menu.", + "You can now access this machine anywhere via the secure tunnel [{0}](command:{4}). To connect via a different machine, use the generated [{1}]({2}) link or use the [{6}]({7}) extension in the desktop or web. You can [configure](command:{3}) or [turn off](command:{5}) this access via the VSCodium Accounts menu.", connectionInfo.tunnelName, connectionInfo.domain, linkToOpenForMarkdown, RemoteTunnelCommandIds.manage, RemoteTunnelCommandIds.configure, RemoteTunnelCommandIds.turnOff, remoteExtension.friendlyName, 'https://code.visualstudio.com/docs/remote/tunnels' -diff --git a/src/vs/workbench/contrib/surveys/browser/ces.contribution.ts b/src/vs/workbench/contrib/surveys/browser/ces.contribution.ts -index b24d91f..a098a62 100644 ---- a/src/vs/workbench/contrib/surveys/browser/ces.contribution.ts -+++ b/src/vs/workbench/contrib/surveys/browser/ces.contribution.ts -@@ -75,3 +75,3 @@ class CESContribution extends Disposable implements IWorkbenchContribution { - -- const message = await this.tasExperimentService?.getTreatment('CESSurveyMessage') ?? nls.localize('cesSurveyQuestion', 'Got a moment to help the VS Code team? Please tell us about your experience with VS Code so far.'); -+ const message = await this.tasExperimentService?.getTreatment('CESSurveyMessage') ?? nls.localize('cesSurveyQuestion', 'Got a moment to help the VSCodium team? Please tell us about your experience with VSCodium so far.'); - const button = await this.tasExperimentService?.getTreatment('CESSurveyButton') ?? nls.localize('giveFeedback', "Give Feedback"); diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts -index e11e8a8..640356b 100644 +index 4670c5a..a8546cc 100644 --- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts +++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts -@@ -3174,3 +3174,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer +@@ -3189,3 +3189,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer if (response.code && response.code === TerminateResponseCode.ProcessNotFound) { - this._notificationService.error(nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting VS Code might result in orphaned processes.')); + this._notificationService.error(nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting VSCodium might result in orphaned processes.')); @@ -882,7 +905,7 @@ index 9efbc2a..18c7aec 100644 + message: nls.localize('TaskSystem.noProcess', 'The launched task doesn\'t exist anymore. If the task spawned background processes exiting VSCodium might result in orphaned processes. To avoid this start the last background process with a wait flag.'), primaryButton: nls.localize({ key: 'TaskSystem.exitAnyways', comment: ['&& denotes a mnemonic'] }, "&&Exit Anyways"), diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts -index d774d65..0040ea1 100644 +index 1efbc44..ea72734 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts @@ -202,3 +202,3 @@ export class TerminalViewPane extends ViewPane { @@ -891,64 +914,78 @@ index d774d65..0040ea1 100644 + this._notificationService.prompt(Severity.Warning, nls.localize('terminal.monospaceOnly', "The terminal only supports monospace fonts. Be sure to restart VSCodium if this is a newly installed font."), choices); } diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts -index c44b2c3..2c02c9c 100644 +index 4dc967f..d4177f6 100644 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts -@@ -295,3 +295,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -296,3 +296,3 @@ const terminalConfiguration: IConfigurationNode = { [TerminalSettingId.DetectLocale]: { - markdownDescription: localize('terminal.integrated.detectLocale', "Controls whether to detect and set the `$LANG` environment variable to a UTF-8 compliant option since VS Code's terminal only supports UTF-8 encoded data coming from the shell."), + markdownDescription: localize('terminal.integrated.detectLocale', "Controls whether to detect and set the `$LANG` environment variable to a UTF-8 compliant option since VSCodium's terminal only supports UTF-8 encoded data coming from the shell."), type: 'string', -@@ -309,3 +309,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -310,3 +310,3 @@ const terminalConfiguration: IConfigurationNode = { markdownEnumDescriptions: [ - localize('terminal.integrated.gpuAcceleration.auto', "Let VS Code detect which renderer will give the best experience."), + localize('terminal.integrated.gpuAcceleration.auto', "Let VSCodium detect which renderer will give the best experience."), localize('terminal.integrated.gpuAcceleration.on', "Enable GPU acceleration within the terminal."), -@@ -397,3 +397,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -398,3 +398,3 @@ const terminalConfiguration: IConfigurationNode = { 'terminal.integrated.commandsToSkipShell', - "A set of command IDs whose keybindings will not be sent to the shell but instead always be handled by VS Code. This allows keybindings that would normally be consumed by the shell to act instead the same as when the terminal is not focused, for example `Ctrl+P` to launch Quick Open.\n\n \n\nMany commands are skipped by default. To override a default and pass that command's keybinding to the shell instead, add the command prefixed with the `-` character. For example add `-workbench.action.quickOpen` to allow `Ctrl+P` to reach the shell.\n\n \n\nThe following list of default skipped commands is truncated when viewed in Settings Editor. To see the full list, {1} and search for the first command from the list below.\n\n \n\nDefault Skipped Commands:\n\n{0}", + "A set of command IDs whose keybindings will not be sent to the shell but instead always be handled by VSCodium. This allows keybindings that would normally be consumed by the shell to act instead the same as when the terminal is not focused, for example `Ctrl+P` to launch Quick Open.\n\n \n\nMany commands are skipped by default. To override a default and pass that command's keybinding to the shell instead, add the command prefixed with the `-` character. For example add `-workbench.action.quickOpen` to allow `Ctrl+P` to reach the shell.\n\n \n\nThe following list of default skipped commands is truncated when viewed in Settings Editor. To see the full list, {1} and search for the first command from the list below.\n\n \n\nDefault Skipped Commands:\n\n{0}", DEFAULT_COMMANDS_TO_SKIP_SHELL.sort().map(command => `- ${command}`).join('\n'), -@@ -409,3 +409,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -410,3 +410,3 @@ const terminalConfiguration: IConfigurationNode = { [TerminalSettingId.AllowChords]: { - markdownDescription: localize('terminal.integrated.allowChords', "Whether or not to allow chord keybindings in the terminal. Note that when this is true and the keystroke results in a chord it will bypass {0}, setting this to false is particularly useful when you want ctrl+k to go to your shell (not VS Code).", '`#terminal.integrated.commandsToSkipShell#`'), + markdownDescription: localize('terminal.integrated.allowChords', "Whether or not to allow chord keybindings in the terminal. Note that when this is true and the keystroke results in a chord it will bypass {0}, setting this to false is particularly useful when you want ctrl+k to go to your shell (not VSCodium).", '`#terminal.integrated.commandsToSkipShell#`'), type: 'boolean', -@@ -420,3 +420,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -421,3 +421,3 @@ const terminalConfiguration: IConfigurationNode = { restricted: true, - markdownDescription: localize('terminal.integrated.env.osx', "Object with environment variables that will be added to the VS Code process to be used by the terminal on macOS. Set to `null` to delete the environment variable."), + markdownDescription: localize('terminal.integrated.env.osx', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on macOS. Set to `null` to delete the environment variable."), type: 'object', -@@ -429,3 +429,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -430,3 +430,3 @@ const terminalConfiguration: IConfigurationNode = { restricted: true, - markdownDescription: localize('terminal.integrated.env.linux', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Linux. Set to `null` to delete the environment variable."), + markdownDescription: localize('terminal.integrated.env.linux', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on Linux. Set to `null` to delete the environment variable."), type: 'object', -@@ -438,3 +438,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -439,3 +439,3 @@ const terminalConfiguration: IConfigurationNode = { restricted: true, - markdownDescription: localize('terminal.integrated.env.windows', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Windows. Set to `null` to delete the environment variable."), + markdownDescription: localize('terminal.integrated.env.windows', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on Windows. Set to `null` to delete the environment variable."), type: 'object', -@@ -562,3 +562,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -468,3 +468,3 @@ const terminalConfiguration: IConfigurationNode = { + [TerminalSettingId.ExperimentalWindowsUseConptyDll]: { +- markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll shipped with VS Code, instead of the one bundled with Windows."), ++ markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll shipped with VSCodium, instead of the one bundled with Windows."), + type: 'boolean', +@@ -568,3 +568,3 @@ const terminalConfiguration: IConfigurationNode = { [TerminalSettingId.AutoReplies]: { - markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VS Code if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'), + markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VSCodium if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'), type: 'object', -@@ -575,3 +575,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -581,3 +581,3 @@ const terminalConfiguration: IConfigurationNode = { restricted: true, - markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VS Code insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegrations.decorationsEnabled#`', '`#editor.accessibilitySupport#`'), + markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VSCodium insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegrations.decorationsEnabled#`', '`#editor.accessibilitySupport#`'), type: 'boolean', +diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts +index b178293..69e4e1b 100644 +--- a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts ++++ b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.ts +@@ -69,3 +69,3 @@ export const terminalSuggestConfiguration: IStringDictionary Date: Thu, 29 Aug 2024 22:43:38 +0200 Subject: [PATCH 07/36] fix(1.93): update patch [skip ci] --- .github/workflows/insider-linux.yml | 4 +- insider.json | 2 +- patches/brand.patch | 76 +++++++++-------------------- 3 files changed, 26 insertions(+), 56 deletions(-) diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index 3bf6a7f..1a3ac3c 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -330,8 +330,8 @@ jobs: include: - vscode_arch: x64 npm_arch: x64 - # - vscode_arch: arm64 - # npm_arch: arm64 + - vscode_arch: arm64 + npm_arch: arm64 env: BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }} MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }} diff --git a/insider.json b/insider.json index 0e65874..7e5be99 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { "tag": "1.93.0", - "commit": "e1db90f81da28c0994b5d50dc2b51e964359e62d" + "commit": "5b066ec2e30cf46bc636d6d27af5404713f6b0f8" } diff --git a/patches/brand.patch b/patches/brand.patch index da83d6e..07ccf87 100644 --- a/patches/brand.patch +++ b/patches/brand.patch @@ -359,7 +359,7 @@ index b18b340..ca2eb2d 100644 + "comment": "The simpler (?<=\\bProcess\\.|\\bCommandLine\\.) breaks VSCodium / Atom, see https://github.com/textmate/swift.tmbundle/issues/29", "name": "support.variable.swift", diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json -index 3067026..d5ef364 100644 +index d2a0ca8..c781a86 100644 --- a/extensions/typescript-language-features/package.nls.json +++ b/extensions/typescript-language-features/package.nls.json @@ -75,4 +75,4 @@ @@ -369,12 +369,12 @@ index 3067026..d5ef364 100644 + "typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use VSCodium's locale.", + "typescript.locale.auto": "Use VSCodium's configured display language", "configuration.implicitProjectConfig.module": "Sets the module system for the program. See more: https://www.typescriptlang.org/tsconfig#module.", -@@ -159,3 +159,3 @@ +@@ -160,3 +160,3 @@ "typescript.workspaceSymbols.excludeLibrarySymbols": "Exclude symbols that come from library files in Go to Symbol in Workspace results. Requires using TypeScript 5.3+ in the workspace.", - "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code.", + "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VSCodium.", "typescript.updateImportsOnFileMove.enabled.prompt": "Prompt on each rename.", -@@ -165,5 +165,5 @@ +@@ -166,5 +166,5 @@ "typescript.suggest.enabled": "Enabled/disable autocomplete suggestions.", - "configuration.surveys.enabled": "Enabled/disable occasional surveys that help us improve VS Code's JavaScript and TypeScript support.", + "configuration.surveys.enabled": "Enabled/disable occasional surveys that help us improve VSCodium's JavaScript and TypeScript support.", @@ -382,7 +382,7 @@ index 3067026..d5ef364 100644 - "configuration.tsserver.useVsCodeWatcher": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", + "configuration.tsserver.useVsCodeWatcher": "Use VSCodium's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", "configuration.tsserver.watchOptions": "Configure which watching strategies should be used to keep track of files and directories.", -@@ -233,6 +233,6 @@ +@@ -234,6 +234,6 @@ "configuration.suggest.objectLiteralMethodSnippets.enabled": "Enable/disable snippet completions for methods in object literals.", - "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VS Code is running in a trusted context.", + "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VSCodium is running in a trusted context.", @@ -391,7 +391,7 @@ index 3067026..d5ef364 100644 - "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.", + "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VSCodium to detect a Node installation.", "configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.6+.", -@@ -247,6 +247,6 @@ +@@ -248,6 +248,6 @@ "walkthroughs.nodejsWelcome.debugJsFile.title": "Run and Debug your JavaScript", - "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VS Code's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)", + "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VSCodium's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)", @@ -419,10 +419,10 @@ index 239519e..a308077 100644 + vscode.window.showErrorMessage(vscode.l10n.t("VSCodium\'s tsserver was deleted by another application such as a misbehaving virus detection tool. Please reinstall VSCodium.")); throw new Error('Could not find bundled tsserver.js'); diff --git a/extensions/typescript-language-features/src/tsconfig.ts b/extensions/typescript-language-features/src/tsconfig.ts -index 04f08a1..2b2b1bb 100644 +index e85c715..9059335 100644 --- a/extensions/typescript-language-features/src/tsconfig.ts +++ b/extensions/typescript-language-features/src/tsconfig.ts -@@ -151,3 +151,3 @@ export async function openProjectConfigForFile( +@@ -155,3 +155,3 @@ export async function openProjectConfigForFile( vscode.window.showInformationMessage( - vscode.l10n.t("Please open a folder in VS Code to use a TypeScript or JavaScript project")); + vscode.l10n.t("Please open a folder in VSCodium to use a TypeScript or JavaScript project")); @@ -772,7 +772,7 @@ index c5d00d3..4f114d4 100644 + const message = requireReload ? localize('ReinstallAction.successReload', "Please reload VSCodium to complete reinstalling the extension {0}.", extension.identifier.id) : localize('ReinstallAction.success', "Reinstalling the extension {0} is completed.", extension.identifier.id); diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -index 584743f..696f927 100644 +index ba69585..8bcc21a 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts @@ -451,3 +451,3 @@ export class Extension implements IExtension { @@ -1044,7 +1044,7 @@ index 9141402..b1aa321 100644 + description: localize('walkthroughs.steps.completionEvents.onCommand', 'Check off step when a given command is executed anywhere in VSCodium.'), body: 'onCommand:${1:commandId}' diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts -index 0b82603..dae0f5c 100644 +index 3ca4575..2d69d73 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts @@ -211,3 +211,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ @@ -1052,7 +1052,7 @@ index 0b82603..dae0f5c 100644 - title: localize('gettingStarted.setup.title', "Get Started with VS Code"), + title: localize('gettingStarted.setup.title', "Get Started with VSCodium"), description: localize('gettingStarted.setup.description', "Customize your editor, learn the basics, and start coding"), -@@ -233,6 +233,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -234,6 +234,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.extensions.title', "Code with extensions"), - description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VS Code's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), + description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VSCodium's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), @@ -1061,7 +1061,7 @@ index 0b82603..dae0f5c 100644 - type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions-web.svg' + type: 'svg', altText: 'VSCodium extension marketplace with featured language extensions', path: 'extensions-web.svg' }, -@@ -251,5 +251,5 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -252,5 +252,5 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.settings.title', "Tune your settings"), - description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), + description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VSCodium and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), @@ -1069,34 +1069,34 @@ index 0b82603..dae0f5c 100644 - type: 'svg', altText: 'VS Code Settings', path: 'settings.svg' + type: 'svg', altText: 'VSCodium Settings', path: 'settings.svg' }, -@@ -269,3 +269,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -270,3 +270,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.commandPalette.title', "Unlock productivity with the Command Palette "), - description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), + description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VSCodium.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' }, -@@ -275,3 +275,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -276,3 +276,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), - description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')), + description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VSCodium.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')), when: 'isMac && workspaceFolderCount == 0', -@@ -284,3 +284,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -285,3 +285,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), - description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')), + description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VSCodium.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')), when: '!isMac && workspaceFolderCount == 0', -@@ -302,4 +302,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -303,4 +303,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.videoTutorial.title', "Watch video tutorials"), - description: localize('gettingStarted.videoTutorial.description.interpolated', "Watch the first in a series of short & practical video tutorials for VS Code's key features.\n{0}", Button(localize('watch', "Watch Tutorial"), 'https://aka.ms/vscode-getting-started-video')), - media: { type: 'svg', altText: 'VS Code Settings', path: 'learn.svg' }, + description: localize('gettingStarted.videoTutorial.description.interpolated', "Watch the first in a series of short & practical video tutorials for VSCodium's key features.\n{0}", Button(localize('watch', "Watch Tutorial"), 'https://aka.ms/vscode-getting-started-video')), + media: { type: 'svg', altText: 'VSCodium Settings', path: 'learn.svg' }, } -@@ -311,3 +311,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -312,3 +312,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ id: 'SetupWeb', - title: localize('gettingStarted.setupWeb.title', "Get Started with VS Code for the Web"), + title: localize('gettingStarted.setupWeb.title', "Get Started with VSCodium for the Web"), description: localize('gettingStarted.setupWeb.description', "Customize your editor, learn the basics, and start coding"), -@@ -342,6 +342,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -343,6 +343,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.extensions.title', "Code with extensions"), - description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VS Code's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), + description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VSCodium's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), @@ -1105,54 +1105,24 @@ index 0b82603..dae0f5c 100644 - type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions-web.svg' + type: 'svg', altText: 'VSCodium extension marketplace with featured language extensions', path: 'extensions-web.svg' }, -@@ -370,3 +370,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -371,3 +371,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.commandPalette.title', "Unlock productivity with the Command Palette "), - description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), + description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VSCodium.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' }, -@@ -376,3 +376,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -377,3 +377,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), - description: localize('gettingStarted.setup.OpenFolderWeb.description.interpolated', "You're all set to start coding. You can open a local project or a remote repository to get your files into VS Code.\n{0}\n{1}", Button(localize('openFolder', "Open Folder"), 'command:workbench.action.addRootFolder'), Button(localize('openRepository', "Open Repository"), 'command:remoteHub.openRepository')), + description: localize('gettingStarted.setup.OpenFolderWeb.description.interpolated', "You're all set to start coding. You can open a local project or a remote repository to get your files into VSCodium.\n{0}\n{1}", Button(localize('openFolder', "Open Folder"), 'command:workbench.action.addRootFolder'), Button(localize('openRepository', "Open Repository"), 'command:remoteHub.openRepository')), when: 'workspaceFolderCount == 0', -@@ -396,4 +396,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -397,4 +397,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ id: 'SetupScreenReader', - title: localize('gettingStarted.setupScreenReader.title', "Get Started with VS Code using a Screen Reader"), - description: localize('gettingStarted.setupScreenReader.description', "Learn the tools and shortcuts that make VS Code accessible. Note that some actions are not actionable from within the context of the walkthrough."), + title: localize('gettingStarted.setupScreenReader.title', "Get Started with VSCodium using a Screen Reader"), + description: localize('gettingStarted.setupScreenReader.description', "Learn the tools and shortcuts that make VSCodium accessible. Note that some actions are not actionable from within the context of the walkthrough."), isFeatured: true, -@@ -474,3 +474,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ - id: 'SetupScreenReaderExtended', -- title: localize('gettingStarted.setupScreenReaderExtended.title', "Learn more about using VS Code with a Screen Reader"), -+ title: localize('gettingStarted.setupScreenReaderExtended.title', "Learn more about using VSCodium with a Screen Reader"), - description: localize('gettingStarted.setupScreenReaderExtended.description', "Customize your editor, learn the basics, and start coding"), -@@ -485,3 +485,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ - title: localize('gettingStarted.extensions.title', "Code with extensions"), -- description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VS Code's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), -+ description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VSCodium's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), - when: 'workspacePlatform == \'webworker\'', -@@ -503,3 +503,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ - title: localize('gettingStarted.settings.title', "Tune your settings"), -- description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), -+ description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VSCodium and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), - media: { -@@ -521,3 +521,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ - title: localize('gettingStarted.commandPalette.title', "Unlock productivity with the Command Palette "), -- description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), -+ description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VSCodium.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), - media: { -@@ -529,3 +529,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ - title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), -- description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')), -+ description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VSCodium.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')), - when: 'isMac && workspaceFolderCount == 0', -@@ -538,3 +538,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ - title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), -- description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')), -+ description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VSCodium.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')), - when: '!isMac && workspaceFolderCount == 0', -@@ -568,6 +568,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -485,6 +485,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.extensions.title', "Code with extensions"), - description: localize('gettingStarted.extensions.description.interpolated', "Extensions are VS Code's power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}", Button(localize('browsePopular', "Browse Popular Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), + description: localize('gettingStarted.extensions.description.interpolated', "Extensions are VSCodium's power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}", Button(localize('browsePopular', "Browse Popular Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), @@ -1214,10 +1184,10 @@ index c51e033..7a68056 100644 + description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running VSCodium extension tests or when you're experiencing difficulties with the credential store.") } diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts -index 9cd7253..14cbeed 100644 +index 5ba2338..22703c2 100644 --- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts +++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts -@@ -735,3 +735,3 @@ export class ExtensionManagementService extends Disposable implements IWorkbench +@@ -739,3 +739,3 @@ export class ExtensionManagementService extends Disposable implements IWorkbench - const productName = localize('VS Code for Web', "{0} for the Web", this.productService.nameLong); + const productName = localize('VSCodium for Web', "{0} for the Web", this.productService.nameLong); From 5cb1be9c619db8911bad5cc1c325f64258a9540d Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Fri, 30 Aug 2024 02:45:04 +0200 Subject: [PATCH 08/36] fix(alpine): download node's docker image (#2013) --- package_alpine_reh.sh | 12 ++++++++++++ patches/alpine/reh/fix-node-docker.patch | 23 +++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 patches/alpine/reh/fix-node-docker.patch diff --git a/package_alpine_reh.sh b/package_alpine_reh.sh index 5cb1d70..60616ac 100755 --- a/package_alpine_reh.sh +++ b/package_alpine_reh.sh @@ -19,6 +19,18 @@ VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:a export VSCODE_HOST_MOUNT VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME +if [[ -d "../patches/alpine/reh/" ]]; then + for file in "../patches/alpine/reh/"*.patch; do + if [[ -f "${file}" ]]; then + echo applying patch: "${file}"; + if ! git apply --ignore-whitespace "${file}"; then + echo failed to apply patch "${file}" >&2 + exit 1 + fi + fi + done +fi + for i in {1..5}; do # try 5 times yarn --frozen-lockfile --check-files && break if [[ $i == 3 ]]; then diff --git a/patches/alpine/reh/fix-node-docker.patch b/patches/alpine/reh/fix-node-docker.patch new file mode 100644 index 0000000..27a7fb5 --- /dev/null +++ b/patches/alpine/reh/fix-node-docker.patch @@ -0,0 +1,23 @@ +diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js +index e12a33e..9300d62 100644 +--- a/build/gulpfile.reh.js ++++ b/build/gulpfile.reh.js +@@ -188,5 +188,16 @@ function getNodeChecksum(expectedName) { + function extractAlpinefromDocker(nodeVersion, platform, arch) { +- const imageName = arch === 'arm64' ? 'arm64v8/node' : 'node'; ++ let imageName = 'node'; ++ let dockerPlatform = ''; ++ ++ if (arch === 'arm64') { ++ imageName = 'arm64v8/node'; ++ ++ const architecture = cp.execSync(`docker info --format '{{json .Architecture}}'`, { encoding: 'utf8' }).trim(); ++ if (architecture != '"aarch64"') { ++ dockerPlatform = '--platform=linux/arm64'; ++ } ++ } ++ + log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from docker image ${imageName}`); +- const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' }); ++ const contents = cp.execSync(`docker run --rm ${dockerPlatform} ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' }); + return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]); From 7578449a67893725580d08c1968a018f3f03ad2e Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Sun, 13 Oct 2024 20:16:48 +0200 Subject: [PATCH 09/36] feat(1.95): update patches (#2055) --- .github/workflows/insider-linux.yml | 26 +++++- .github/workflows/stable-linux.yml | 26 +++++- build/update_patches.sh | 10 ++- electron.riscv64.sh | 4 +- insider.json | 4 +- patches/brand.patch | 99 +++++++++++------------ patches/build-version.patch | 30 +++---- patches/crash-reporter.patch | 19 ++--- patches/helper/settings.patch | 2 +- patches/linux/client/disable-remote.patch | 22 +++-- patches/linux/fix-build.patch | 22 ++--- patches/linux/fix-reh-bootstrap.patch | 21 ++--- patches/linux/reh/node16.patch | 30 +++---- patches/merge-user-product.patch | 25 +++--- product.json | 7 +- 15 files changed, 196 insertions(+), 151 deletions(-) diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index ce13477..8c77a60 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -92,10 +92,16 @@ jobs: PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }} run: ./get_pr.sh + - name: Setup GCC + uses: egor-tensin/setup-gcc@v1 + with: + version: 10 + platform: x64 + - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '18.17' + node-version: '20.17' if: env.SHOULD_BUILD == 'yes' - name: Install Yarn @@ -260,8 +266,8 @@ jobs: npm_arch: arm64 - vscode_arch: armhf npm_arch: arm - - vscode_arch: ppc64le - npm_arch: ppc64 + # - vscode_arch: ppc64le + # npm_arch: ppc64 - vscode_arch: riscv64 npm_arch: riscv64 env: @@ -284,10 +290,16 @@ jobs: PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }} run: ./get_pr.sh + - name: Setup GCC + uses: egor-tensin/setup-gcc@v1 + with: + version: 10 + platform: x64 + - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '18.17' + node-version: '20.17' - name: Setup Python 3 uses: actions/setup-python@v5 @@ -369,6 +381,12 @@ jobs: PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }} run: ./get_pr.sh + - name: Setup GCC + uses: egor-tensin/setup-gcc@v1 + with: + version: 10 + platform: x64 + - name: Install GH run: ./install_gh.sh if: env.SHOULD_DEPLOY == 'yes' diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml index ecb17f3..66f7885 100644 --- a/.github/workflows/stable-linux.yml +++ b/.github/workflows/stable-linux.yml @@ -91,10 +91,16 @@ jobs: PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }} run: ./get_pr.sh + - name: Setup GCC + uses: egor-tensin/setup-gcc@v1 + with: + version: 10 + platform: x64 + - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '18.17' + node-version: '20.17' if: env.SHOULD_BUILD == 'yes' - name: Install Yarn @@ -259,8 +265,8 @@ jobs: npm_arch: arm64 - vscode_arch: armhf npm_arch: arm - - vscode_arch: ppc64le - npm_arch: ppc64 + # - vscode_arch: ppc64le + # npm_arch: ppc64 - vscode_arch: riscv64 npm_arch: riscv64 env: @@ -283,10 +289,16 @@ jobs: PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }} run: ./get_pr.sh + - name: Setup GCC + uses: egor-tensin/setup-gcc@v1 + with: + version: 10 + platform: x64 + - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '18.17' + node-version: '20.17' - name: Setup Python 3 uses: actions/setup-python@v5 @@ -368,6 +380,12 @@ jobs: PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }} run: ./get_pr.sh + - name: Setup GCC + uses: egor-tensin/setup-gcc@v1 + with: + version: 10 + platform: x64 + - name: Install GH run: ./install_gh.sh if: env.SHOULD_DEPLOY == 'yes' diff --git a/build/update_patches.sh b/build/update_patches.sh index f9900f6..98af370 100755 --- a/build/update_patches.sh +++ b/build/update_patches.sh @@ -47,6 +47,12 @@ if [[ "${VSCODE_QUALITY}" == "insider" ]]; then done fi -for FILE in ../patches/linux/*/*.patch; do - check_file "${FILE}" +for ARCH in alpine linux osx windows; do + for FILE in "../patches/${ARCH}/"*.patch; do + check_file "${FILE}" + done + + for FILE in "../patches/${ARCH}/"*/*.patch; do + check_file "${FILE}" + done done diff --git a/electron.riscv64.sh b/electron.riscv64.sh index 658adf3..1d03679 100755 --- a/electron.riscv64.sh +++ b/electron.riscv64.sh @@ -2,7 +2,7 @@ set -ex -export ELECTRON_VERSION="30.5.1" +export ELECTRON_VERSION="32.1.2" export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}.riscv1" -echo "dfae1ccddec728faa7e5dcc92fb38ee7c40251e7f7638817da1c2a94dd37b5c2 *electron-v${ELECTRON_VERSION}-linux-riscv64.zip" >> build/checksums/electron.txt +echo "1893e6e8831ddd9c30111db02ad7edbaad8ebbf43d69054657f7221fb6086819 *electron-v${ELECTRON_VERSION}-linux-riscv64.zip" >> build/checksums/electron.txt diff --git a/insider.json b/insider.json index 7e5be99..553d16d 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { - "tag": "1.93.0", - "commit": "5b066ec2e30cf46bc636d6d27af5404713f6b0f8" + "tag": "1.95.0", + "commit": "a016ec9b66ffdd3ff0f831768b8e75be008a54e4" } diff --git a/patches/brand.patch b/patches/brand.patch index 759ac5f..ef0ff94 100644 --- a/patches/brand.patch +++ b/patches/brand.patch @@ -62,7 +62,7 @@ index 1be4d0e..73a8f3e 100644 -export const redundantImplicitActivationEvent = l10n.t("This activation event can be removed as VS Code generates these automatically from your package.json contribution declarations."); +export const redundantImplicitActivationEvent = l10n.t("This activation event can be removed as VSCodium generates these automatically from your package.json contribution declarations."); diff --git a/extensions/extension-editing/src/extensionLinter.ts b/extensions/extension-editing/src/extensionLinter.ts -index b69dac0..293e866 100644 +index be7eea1..389e89e 100644 --- a/extensions/extension-editing/src/extensionLinter.ts +++ b/extensions/extension-editing/src/extensionLinter.ts @@ -34,4 +34,4 @@ const relativeUrlRequiresHttpsRepository = l10n.t("Relative image URLs require a @@ -73,37 +73,37 @@ index b69dac0..293e866 100644 +const bumpEngineForImplicitActivationEvents = l10n.t("This activation event can be removed for extensions targeting engine version ^1.75 as VSCodium will generate these automatically from your package.json contribution declarations."); const starActivation = l10n.t("Using '*' activation is usually a bad idea as it impacts performance."); diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json -index bad361b..300261a 100644 +index 78a6b0f..10712a2 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json -@@ -221,3 +221,3 @@ +@@ -222,3 +222,3 @@ "{Locked='](command:git.showOutput'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -249,4 +249,4 @@ +@@ -250,4 +250,4 @@ "config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.", - "config.terminalAuthentication": "Controls whether to enable VS Code to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.", - "config.terminalGitEditor": "Controls whether to enable VS Code to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.", + "config.terminalAuthentication": "Controls whether to enable VSCodium to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.", + "config.terminalGitEditor": "Controls whether to enable VSCodium to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.", "config.timeline.showAuthor": "Controls whether to show the commit author in the Timeline view.", -@@ -305,3 +305,3 @@ +@@ -306,3 +306,3 @@ "{Locked='](command:workbench.action.reloadWindow'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -313,3 +313,3 @@ +@@ -314,3 +314,3 @@ "{Locked='](command:workbench.action.reloadWindow'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -321,3 +321,3 @@ +@@ -322,3 +322,3 @@ "{Locked='](command:workbench.action.reloadWindow'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -327,6 +327,6 @@ +@@ -328,6 +328,6 @@ "view.workbench.scm.disabled": { - "message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).", @@ -112,7 +112,7 @@ index bad361b..300261a 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -335,6 +335,6 @@ +@@ -336,6 +336,6 @@ "view.workbench.scm.empty": { - "message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).", @@ -121,7 +121,7 @@ index bad361b..300261a 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -343,6 +343,6 @@ +@@ -344,6 +344,6 @@ "view.workbench.scm.folder": { - "message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).", @@ -130,7 +130,7 @@ index bad361b..300261a 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -351,6 +351,6 @@ +@@ -352,6 +352,6 @@ "view.workbench.scm.workspace": { - "message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).", @@ -139,7 +139,7 @@ index bad361b..300261a 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -359,6 +359,6 @@ +@@ -360,6 +360,6 @@ "view.workbench.scm.emptyWorkspace": { - "message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).", @@ -148,27 +148,27 @@ index bad361b..300261a 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -377,3 +377,3 @@ +@@ -378,3 +378,3 @@ "{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -386,3 +386,3 @@ +@@ -387,3 +387,3 @@ "{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -394,3 +394,3 @@ +@@ -395,3 +395,3 @@ "{Locked='](command:git.manageUnsafeRepositories'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -402,3 +402,3 @@ +@@ -403,3 +403,3 @@ "{Locked='](command:git.manageUnsafeRepositories'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -407,6 +407,6 @@ +@@ -408,6 +408,6 @@ "view.workbench.scm.closedRepository": { - "message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).", @@ -177,7 +177,7 @@ index bad361b..300261a 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -415,6 +415,6 @@ +@@ -416,6 +416,6 @@ "view.workbench.scm.closedRepositories": { - "message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).", @@ -186,12 +186,12 @@ index bad361b..300261a 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -426,3 +426,3 @@ +@@ -427,3 +427,3 @@ "{Locked='](command:git.clone'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -430,3 +430,3 @@ +@@ -431,3 +431,3 @@ }, - "view.workbench.learnMore": "To learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm)." + "view.workbench.learnMore": "To learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm)." @@ -359,7 +359,7 @@ index b18b340..ca2eb2d 100644 + "comment": "The simpler (?<=\\bProcess\\.|\\bCommandLine\\.) breaks VSCodium / Atom, see https://github.com/textmate/swift.tmbundle/issues/29", "name": "support.variable.swift", diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json -index d9c4ddb..4f0516c 100644 +index 4a62db6..233fb1f 100644 --- a/extensions/typescript-language-features/package.nls.json +++ b/extensions/typescript-language-features/package.nls.json @@ -75,4 +75,4 @@ @@ -374,15 +374,19 @@ index d9c4ddb..4f0516c 100644 - "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code.", + "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VSCodium.", "typescript.updateImportsOnFileMove.enabled.prompt": "Prompt on each rename.", -@@ -166,5 +166,5 @@ +@@ -166,8 +166,8 @@ "typescript.suggest.enabled": "Enabled/disable autocomplete suggestions.", - "configuration.surveys.enabled": "Enabled/disable occasional surveys that help us improve VS Code's JavaScript and TypeScript support.", + "configuration.surveys.enabled": "Enabled/disable occasional surveys that help us improve VSCodium's JavaScript and TypeScript support.", "configuration.suggest.completeJSDocs": "Enable/disable suggestion to complete JSDoc comments.", - "configuration.tsserver.useVsCodeWatcher": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", + "configuration.tsserver.useVsCodeWatcher": "Use VSCodium's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", + "configuration.tsserver.useVsCodeWatcher.deprecation": "Please use the `#typescript.tsserver.watchOptions#` setting instead.", "configuration.tsserver.watchOptions": "Configure which watching strategies should be used to keep track of files and directories.", -@@ -234,6 +234,6 @@ +- "configuration.tsserver.watchOptions.vscode": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", ++ "configuration.tsserver.watchOptions.vscode": "Use VSCodium's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", + "configuration.tsserver.watchOptions.watchFile": "Strategy for how individual files are watched.", +@@ -236,6 +236,6 @@ "configuration.suggest.objectLiteralMethodSnippets.enabled": "Enable/disable snippet completions for methods in object literals.", - "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VS Code is running in a trusted context.", + "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VSCodium is running in a trusted context.", @@ -390,8 +394,8 @@ index d9c4ddb..4f0516c 100644 "configuration.tsserver.web.typeAcquisition.enabled": "Enable/disable package acquisition on the web. This enables IntelliSense for imported packages. Requires `#typescript.tsserver.web.projectWideIntellisense.enabled#`. Currently not supported for Safari.", - "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.", + "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VSCodium to detect a Node installation.", - "configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.6+.", -@@ -249,6 +249,6 @@ + "configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.7+.", +@@ -251,6 +251,6 @@ "walkthroughs.nodejsWelcome.debugJsFile.title": "Run and Debug your JavaScript", - "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VS Code's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)", + "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VSCodium's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)", @@ -525,7 +529,7 @@ index fa001b5..13abac2 100644 + throw Error(`Failed to download and unzip VSCodium ${quality} - ${commit}`); } diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts -index 2942951..86c5653 100644 +index ebf401d..bed25b5 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -532,3 +532,3 @@ export class CodeApplication extends Disposable { @@ -775,7 +779,7 @@ index 3930f44..89051bd 100644 + const message = requireReload ? localize('ReinstallAction.successReload', "Please reload VSCodium to complete reinstalling the extension {0}.", extension.identifier.id) : localize('ReinstallAction.success', "Reinstalling the extension {0} is completed.", extension.identifier.id); diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -index e34a900..c976572 100644 +index 1575be2..74384e1 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts @@ -452,3 +452,3 @@ export class Extension implements IExtension { @@ -908,64 +912,59 @@ index 6a5728c..2c561bd 100644 + message: nls.localize('TaskSystem.noProcess', 'The launched task doesn\'t exist anymore. If the task spawned background processes exiting VSCodium might result in orphaned processes. To avoid this start the last background process with a wait flag.'), primaryButton: nls.localize({ key: 'TaskSystem.exitAnyways', comment: ['&& denotes a mnemonic'] }, "&&Exit Anyways"), diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts -index 13d0821..171a99d 100644 +index dd683b4..07bce78 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts -@@ -202,3 +202,3 @@ export class TerminalViewPane extends ViewPane { +@@ -203,3 +203,3 @@ export class TerminalViewPane extends ViewPane { }]; - this._notificationService.prompt(Severity.Warning, nls.localize('terminal.monospaceOnly', "The terminal only supports monospace fonts. Be sure to restart VS Code if this is a newly installed font."), choices); + this._notificationService.prompt(Severity.Warning, nls.localize('terminal.monospaceOnly', "The terminal only supports monospace fonts. Be sure to restart VSCodium if this is a newly installed font."), choices); } diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts -index 4b36691..a87a683 100644 +index 33ca655..353692a 100644 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts -@@ -296,3 +296,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -287,3 +287,3 @@ const terminalConfiguration: IConfigurationNode = { [TerminalSettingId.DetectLocale]: { - markdownDescription: localize('terminal.integrated.detectLocale', "Controls whether to detect and set the `$LANG` environment variable to a UTF-8 compliant option since VS Code's terminal only supports UTF-8 encoded data coming from the shell."), + markdownDescription: localize('terminal.integrated.detectLocale', "Controls whether to detect and set the `$LANG` environment variable to a UTF-8 compliant option since VSCodium's terminal only supports UTF-8 encoded data coming from the shell."), type: 'string', -@@ -310,3 +310,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -301,3 +301,3 @@ const terminalConfiguration: IConfigurationNode = { markdownEnumDescriptions: [ - localize('terminal.integrated.gpuAcceleration.auto', "Let VS Code detect which renderer will give the best experience."), + localize('terminal.integrated.gpuAcceleration.auto', "Let VSCodium detect which renderer will give the best experience."), localize('terminal.integrated.gpuAcceleration.on', "Enable GPU acceleration within the terminal."), -@@ -398,3 +398,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -389,3 +389,3 @@ const terminalConfiguration: IConfigurationNode = { 'terminal.integrated.commandsToSkipShell', - "A set of command IDs whose keybindings will not be sent to the shell but instead always be handled by VS Code. This allows keybindings that would normally be consumed by the shell to act instead the same as when the terminal is not focused, for example `Ctrl+P` to launch Quick Open.\n\n \n\nMany commands are skipped by default. To override a default and pass that command's keybinding to the shell instead, add the command prefixed with the `-` character. For example add `-workbench.action.quickOpen` to allow `Ctrl+P` to reach the shell.\n\n \n\nThe following list of default skipped commands is truncated when viewed in Settings Editor. To see the full list, {1} and search for the first command from the list below.\n\n \n\nDefault Skipped Commands:\n\n{0}", + "A set of command IDs whose keybindings will not be sent to the shell but instead always be handled by VSCodium. This allows keybindings that would normally be consumed by the shell to act instead the same as when the terminal is not focused, for example `Ctrl+P` to launch Quick Open.\n\n \n\nMany commands are skipped by default. To override a default and pass that command's keybinding to the shell instead, add the command prefixed with the `-` character. For example add `-workbench.action.quickOpen` to allow `Ctrl+P` to reach the shell.\n\n \n\nThe following list of default skipped commands is truncated when viewed in Settings Editor. To see the full list, {1} and search for the first command from the list below.\n\n \n\nDefault Skipped Commands:\n\n{0}", DEFAULT_COMMANDS_TO_SKIP_SHELL.sort().map(command => `- ${command}`).join('\n'), -@@ -410,3 +410,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -401,3 +401,3 @@ const terminalConfiguration: IConfigurationNode = { [TerminalSettingId.AllowChords]: { - markdownDescription: localize('terminal.integrated.allowChords', "Whether or not to allow chord keybindings in the terminal. Note that when this is true and the keystroke results in a chord it will bypass {0}, setting this to false is particularly useful when you want ctrl+k to go to your shell (not VS Code).", '`#terminal.integrated.commandsToSkipShell#`'), + markdownDescription: localize('terminal.integrated.allowChords', "Whether or not to allow chord keybindings in the terminal. Note that when this is true and the keystroke results in a chord it will bypass {0}, setting this to false is particularly useful when you want ctrl+k to go to your shell (not VSCodium).", '`#terminal.integrated.commandsToSkipShell#`'), type: 'boolean', -@@ -421,3 +421,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -412,3 +412,3 @@ const terminalConfiguration: IConfigurationNode = { restricted: true, - markdownDescription: localize('terminal.integrated.env.osx', "Object with environment variables that will be added to the VS Code process to be used by the terminal on macOS. Set to `null` to delete the environment variable."), + markdownDescription: localize('terminal.integrated.env.osx', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on macOS. Set to `null` to delete the environment variable."), type: 'object', -@@ -430,3 +430,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -421,3 +421,3 @@ const terminalConfiguration: IConfigurationNode = { restricted: true, - markdownDescription: localize('terminal.integrated.env.linux', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Linux. Set to `null` to delete the environment variable."), + markdownDescription: localize('terminal.integrated.env.linux', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on Linux. Set to `null` to delete the environment variable."), type: 'object', -@@ -439,3 +439,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -430,3 +430,3 @@ const terminalConfiguration: IConfigurationNode = { restricted: true, - markdownDescription: localize('terminal.integrated.env.windows', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Windows. Set to `null` to delete the environment variable."), + markdownDescription: localize('terminal.integrated.env.windows', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on Windows. Set to `null` to delete the environment variable."), type: 'object', -@@ -468,3 +468,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -459,3 +459,3 @@ const terminalConfiguration: IConfigurationNode = { [TerminalSettingId.ExperimentalWindowsUseConptyDll]: { - markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll shipped with VS Code, instead of the one bundled with Windows."), + markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll shipped with VSCodium, instead of the one bundled with Windows."), type: 'boolean', -@@ -568,3 +568,3 @@ const terminalConfiguration: IConfigurationNode = { - [TerminalSettingId.AutoReplies]: { -- markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VS Code if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'), -+ markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VSCodium if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'), - type: 'object', -@@ -581,3 +581,3 @@ const terminalConfiguration: IConfigurationNode = { +@@ -560,3 +560,3 @@ const terminalConfiguration: IConfigurationNode = { restricted: true, - markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VS Code insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegrations.decorationsEnabled#`', '`#editor.accessibilitySupport#`'), + markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VSCodium insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegrations.decorationsEnabled#`', '`#editor.accessibilitySupport#`'), @@ -1171,24 +1170,24 @@ index 0ab6828..6c8b5ef 100644 + markdownDescription: localize('workspace.trust.emptyWindow.description', "Controls whether or not the empty window is trusted by default within VSCodium. When used with `#{0}#`, you can enable the full functionality of VSCodium without prompting in an empty window.", WORKSPACE_TRUST_UNTRUSTED_FILES), tags: [WORKSPACE_TRUST_SETTING_TAG], diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts -index f6bae66..a4d5856 100644 +index b638748..13af28d 100644 --- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts +++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts -@@ -401,3 +401,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s +@@ -402,3 +402,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s type: 'boolean', - description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running VS Code as elevated on Linux and running under Applocker on Windows.") + description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running VSCodium as elevated on Linux and running under Applocker on Windows.") }, -@@ -405,3 +405,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s +@@ -406,3 +406,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s type: 'boolean', - description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running VS Code extension tests or when you're experiencing difficulties with the credential store.") + description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running VSCodium extension tests or when you're experiencing difficulties with the credential store.") } diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts -index 45bd7f0..8705da3 100644 +index 90ff933..8b40a84 100644 --- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts +++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts -@@ -762,3 +762,3 @@ export class ExtensionManagementService extends Disposable implements IWorkbench +@@ -765,3 +765,3 @@ export class ExtensionManagementService extends Disposable implements IWorkbench - const productName = localize('VS Code for Web', "{0} for the Web", this.productService.nameLong); + const productName = localize('VSCodium for Web', "{0} for the Web", this.productService.nameLong); @@ -1208,7 +1207,7 @@ index ac3c7ed..542bb3c 100644 + comment: 'This is used to understand the drop funnel of extension URI handling by the OS & VSCodium.'; }; diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts -index bb8220b..ca56b50 100644 +index 03fbc7d..1903754 100644 --- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts +++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts @@ -178,3 +178,3 @@ export const schema: IJSONSchema = { diff --git a/patches/build-version.patch b/patches/build-version.patch index 5bebde8..149b5e3 100644 --- a/patches/build-version.patch +++ b/patches/build-version.patch @@ -1,43 +1,43 @@ diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js -index e314794..fce8d15 100644 +index 53ef6f3..411da6b 100644 --- a/build/gulpfile.reh.js +++ b/build/gulpfile.reh.js -@@ -343,2 +343,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa +@@ -307,2 +307,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa const name = product.nameShort; + const release = packageJson.release; -@@ -346,3 +347,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa +@@ -310,3 +311,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' }) -- .pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, ...(!isAMD() ? { type: 'module' } : {}) })) // TODO@esm this should be configured in the top level package.json -+ .pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined, ...(!isAMD() ? { type: 'module' } : {}) })) // TODO@esm this should be configured in the top level package.json +- .pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, type: 'module' })) ++ .pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined, type: 'module' })) .pipe(es.through(function (file) { -@@ -354,3 +355,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa +@@ -318,3 +319,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa const productJsonStream = gulp.src(['product.json'], { base: '.' }) - .pipe(json({ commit, date: readISODate('out-build'), version })) + .pipe(json({ commit, date: readISODate('out-build'), version, release })) .pipe(es.through(function (file) { diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js -index 9dfb6a3..a4277ff 100644 +index d59b42d..61670c0 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js -@@ -320,3 +320,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op +@@ -268,3 +268,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op - let version = packageJson.version; + let version = packageJson.version const quality = product.quality; -@@ -328,3 +328,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op +@@ -276,3 +276,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op const name = product.nameShort; -- const packageJsonUpdates = { name, version, ...(!isAMD() ? { type: 'module', main: 'out/main.js' } : {}) }; // TODO@esm this should be configured in the top level package.json +- const packageJsonUpdates = { name, version }; + const release = packageJson.release; -+ const packageJsonUpdates = { name, version, release, ...(!isAMD() ? { type: 'module', main: 'out/main.js' } : {}) }; // TODO@esm this should be configured in the top level package.json ++ const packageJsonUpdates = { name, version, release }; -@@ -345,3 +346,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op +@@ -293,3 +294,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op const productJsonStream = gulp.src(['product.json'], { base: '.' }) - .pipe(json({ commit, date: readISODate('out-build'), checksums, version })) + .pipe(json({ commit, date: readISODate('out-build'), checksums, version, release })) .pipe(es.through(function (file) { diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js -index 5fa5a5d..b08e376 100644 +index fb0e5a4..170c60b 100644 --- a/build/gulpfile.vscode.linux.js +++ b/build/gulpfile.vscode.linux.js @@ -27,4 +27,2 @@ const commit = getVersion(root); @@ -73,7 +73,7 @@ index 98175f5..afacbe3 100644 + RawVersion: `${pkg.version.replace(/-\w+$/, '')}.${pkg.release}`, NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''), diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts -index c397b1a..ccf7911 100644 +index 1f58ce0..1555ae2 100644 --- a/src/vs/base/common/product.ts +++ b/src/vs/base/common/product.ts @@ -58,2 +58,3 @@ export interface IProductConfiguration { @@ -90,7 +90,7 @@ index 5f6efd5..da3c54d 100644 + output.push(`Version: ${this.productService.nameShort} ${this.productService.version} ${this.productService.release || 'Release unknown'} (${this.productService.commit || 'Commit unknown'}, ${this.productService.date || 'Date unknown'})`); output.push(`OS Version: ${osLib.type()} ${osLib.arch()} ${osLib.release()}`); diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts -index a98043f..b54a78f 100644 +index 1a2a619..2a8d683 100644 --- a/src/vs/platform/product/common/product.ts +++ b/src/vs/platform/product/common/product.ts @@ -43,6 +43,7 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) { diff --git a/patches/crash-reporter.patch b/patches/crash-reporter.patch index d86a90b..8c9a786 100644 --- a/patches/crash-reporter.patch +++ b/patches/crash-reporter.patch @@ -1,13 +1,10 @@ -diff --git a/src/main.js b/src/main.js -index 19dde20..d9611f2 100644 ---- a/src/main.js -+++ b/src/main.js -@@ -409,6 +409,8 @@ function configureCrashReporter() { - argv.splice(endOfArgsMarkerIndex, 0, '--crash-reporter-id', crashReporterId); - } - } -+ } else { -+ return; +diff --git a/src/main.ts b/src/main.ts +index 62ddd5f..a6fc3c5 100644 +--- a/src/main.ts ++++ b/src/main.ts +@@ -461,2 +461,5 @@ function configureCrashReporter(): void { } ++ else { ++ return; ++ } } - diff --git a/patches/helper/settings.patch b/patches/helper/settings.patch index 70c4f35..b3ef494 100644 --- a/patches/helper/settings.patch +++ b/patches/helper/settings.patch @@ -3,7 +3,7 @@ index 99e495a..996044a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,5 +10,5 @@ - "cli/target": true, + "build/**/*.js.map": true, - "build/**/*.js": { - "when": "$(basename).ts" - } diff --git a/patches/linux/client/disable-remote.patch b/patches/linux/client/disable-remote.patch index 7e288b2..99c8d8e 100644 --- a/patches/linux/client/disable-remote.patch +++ b/patches/linux/client/disable-remote.patch @@ -1,8 +1,14 @@ -diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js -index e38c2cb..e00627c 100644 ---- a/build/npm/postinstall.js -+++ b/build/npm/postinstall.js -@@ -134,2 +134,3 @@ for (let dir of dirs) { - setNpmrcConfig('remote', opts.env); -+ continue; - } +diff --git a/build/npm/dirs.js b/build/npm/dirs.js +index b9645e6..22f3450 100644 +--- a/build/npm/dirs.js ++++ b/build/npm/dirs.js +@@ -47,4 +47,2 @@ const dirs = [ + 'extensions/vscode-test-resolver', +- 'remote', +- 'remote/web', + 'test/automation', +@@ -59,4 +57,2 @@ if (fs.existsSync(`${__dirname}/../../.build/distro/npm`)) { + dirs.push('.build/distro/npm'); +- dirs.push('.build/distro/npm/remote'); +- dirs.push('.build/distro/npm/remote/web'); + } diff --git a/patches/linux/fix-build.patch b/patches/linux/fix-build.patch index e8be33f..69ba0e7 100644 --- a/patches/linux/fix-build.patch +++ b/patches/linux/fix-build.patch @@ -1,39 +1,39 @@ diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js -index 28ddfb0..0fd18a1 100644 +index fb0e5a4..412a6cc 100644 --- a/build/gulpfile.vscode.linux.js +++ b/build/gulpfile.vscode.linux.js -@@ -192,2 +192,3 @@ function prepareRpmPackage(arch) { +@@ -197,2 +197,3 @@ function prepareRpmPackage(arch) { const spec = code.pipe(es.through( + null, async function () { -@@ -306,4 +307,3 @@ BUILD_TARGETS.forEach(({ arch }) => { +@@ -312,4 +313,3 @@ BUILD_TARGETS.forEach(({ arch }) => { const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch))); - gulp.task(prepareDebTask); - const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, buildDebPackage(arch)); + const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, task.series(prepareDebTask, buildDebPackage(arch))); gulp.task(buildDebTask); -@@ -312,4 +312,3 @@ BUILD_TARGETS.forEach(({ arch }) => { +@@ -318,4 +318,3 @@ BUILD_TARGETS.forEach(({ arch }) => { const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch))); - gulp.task(prepareRpmTask); - const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, buildRpmPackage(arch)); + const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch))); gulp.task(buildRpmTask); diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js -index 19adbeb..fef80a5 100644 +index 374c9b6..da5ef4d 100644 --- a/build/linux/dependencies-generator.js +++ b/build/linux/dependencies-generator.js @@ -24,3 +24,3 @@ const product = require("../../product.json"); // are valid, are in dep-lists.ts -const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true; +const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false; - // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/124.0.6367.243:chrome/installer/linux/BUILD.gn;l=64-80 -@@ -56,3 +56,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) { + // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.162:chrome/installer/linux/BUILD.gn;l=64-80 +@@ -57,3 +57,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) { // Add the tunnel binary. - files.push(path.join(buildDir, 'bin', product.tunnelApplicationName)); + // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName)); // Add the main executable. diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts -index 5fe4ac5..1d3e68a 100644 +index 3c7f6f5..cd33e87 100644 --- a/build/linux/dependencies-generator.ts +++ b/build/linux/dependencies-generator.ts @@ -25,3 +25,3 @@ import product = require('../../product.json'); @@ -41,16 +41,16 @@ index 5fe4ac5..1d3e68a 100644 -const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true; +const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false; -@@ -61,3 +61,3 @@ export async function getDependencies(packageType: 'deb' | 'rpm', buildDir: stri +@@ -62,3 +62,3 @@ export async function getDependencies(packageType: 'deb' | 'rpm', buildDir: stri // Add the tunnel binary. - files.push(path.join(buildDir, 'bin', product.tunnelApplicationName)); + // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName)); // Add the main executable. diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template -index c9e57db..bda2604 100644 +index a73bc02..340b94e 100644 --- a/resources/linux/rpm/code.spec.template +++ b/resources/linux/rpm/code.spec.template -@@ -87 +87,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || : +@@ -88 +88,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_datadir}/zsh/site-functions/_%{name} + +%config(noreplace) /usr/share/%{name}/resources/app/product.json diff --git a/patches/linux/fix-reh-bootstrap.patch b/patches/linux/fix-reh-bootstrap.patch index 1b3760f..b0e87e6 100644 --- a/patches/linux/fix-reh-bootstrap.patch +++ b/patches/linux/fix-reh-bootstrap.patch @@ -1,24 +1,25 @@ -diff --git a/src/bootstrap-amd.js b/src/bootstrap-amd.js -index 9c8daf5..297e106 100644 ---- a/src/bootstrap-amd.js -+++ b/src/bootstrap-amd.js -@@ -17,3 +17,3 @@ import * as fs from 'fs'; +diff --git a/src/bootstrap-esm.ts b/src/bootstrap-esm.ts +index f2cf101..d974f65 100644 +--- a/src/bootstrap-esm.ts ++++ b/src/bootstrap-esm.ts +@@ -8,3 +8,3 @@ import * as fs from 'fs'; import { fileURLToPath } from 'url'; -import { createRequire, register } from 'node:module'; +import * as Module from 'node:module'; import { product, pkg } from './bootstrap-meta.js'; -@@ -23,3 +23,3 @@ import * as performance from './vs/base/common/performance.js'; - /** @ts-ignore */ +@@ -14,3 +14,4 @@ import { INLSConfiguration } from './vs/nls.js'; + -const require = createRequire(import.meta.url); ++// @ts-ignore +const require = Module.createRequire(import.meta.url); - /** @type any */ -@@ -29,3 +29,4 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url)); + const __dirname = path.dirname(fileURLToPath(import.meta.url)); +@@ -18,3 +19,4 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url)); // Install a hook to module resolution to map 'fs' to 'original-fs' -if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) { +// @ts-ignore +if (Module.register && (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron'])) { const jsCode = ` -@@ -44,3 +45,4 @@ if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) { +@@ -33,3 +35,4 @@ if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) { }`; - register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url); + // @ts-ignore diff --git a/patches/linux/reh/node16.patch b/patches/linux/reh/node16.patch index cdd8049..b49c1ab 100644 --- a/patches/linux/reh/node16.patch +++ b/patches/linux/reh/node16.patch @@ -1,8 +1,8 @@ diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js -index e314794..8248247 100644 +index 53ef6f3..7dedc4b 100644 --- a/build/gulpfile.reh.js +++ b/build/gulpfile.reh.js -@@ -437,16 +437,2 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa +@@ -401,16 +401,2 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa - if (platform === 'linux' && process.env['VSCODE_NODE_GLIBC'] === '-glibc-2.17') { - result = es.merge(result, @@ -20,15 +20,15 @@ index e314794..8248247 100644 - result = inlineMeta(result, { diff --git a/remote/package-lock.json b/remote/package-lock.json -index 5872575..a559230 100644 +index 290e188..fc8fd04 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -37,3 +37,3 @@ "native-watchdog": "^1.4.1", -- "node-pty": "1.1.0-beta21", +- "node-pty": "^1.1.0-beta22", + "node-pty": "1.1.0-beta4", "tas-client-umd": "0.2.0", -@@ -712,2 +712,8 @@ +@@ -703,2 +703,8 @@ }, + "node_modules/nan": { + "version": "2.20.0", @@ -37,11 +37,11 @@ index 5872575..a559230 100644 + "license": "MIT" + }, "node_modules/napi-build-utils": { -@@ -750,16 +756,9 @@ +@@ -745,8 +751,9 @@ "node_modules/node-pty": { -- "version": "1.1.0-beta21", -- "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta21.tgz", -- "integrity": "sha512-FYpnY9g8qMQLTpqyeY9NVli6YfCWwvG6v6gmaDBbPjlc1VMp/+Zivq0SStDrRr1aciGnFCZzpL0BzdMnmbDnAw==", +- "version": "1.1.0-beta22", +- "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta22.tgz", +- "integrity": "sha512-CpT334H2oAIULlENvd9U+VBW4ZL+G3clOnpXYzUIurlPCLnl/9xen/KDHBLRcwhZuWcHxIrsCxR1TDCdVDtr0w==", + "version": "1.1.0-beta4", + "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta4.tgz", + "integrity": "sha512-CgffN9AxVtH4g7vDxtanm2qaR7jw3oet9r+ArzziGiFvmds9SdR3gXkZF0fqZWSxhTHZusJWvsuKvRv+5O2K8A==", @@ -49,22 +49,14 @@ index 5872575..a559230 100644 + "license": "MIT", "dependencies": { - "node-addon-api": "^7.1.0" -- } -- }, -- "node_modules/node-pty/node_modules/node-addon-api": { -- "version": "7.1.0", -- "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", -- "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", -- "engines": { -- "node": "^16 || ^18 || >= 20" + "nan": "^2.17.0" } diff --git a/remote/package.json b/remote/package.json -index c107b04..112501b 100644 +index e8ea864..08d756d 100644 --- a/remote/package.json +++ b/remote/package.json @@ -32,3 +32,3 @@ "native-watchdog": "^1.4.1", -- "node-pty": "1.1.0-beta21", +- "node-pty": "^1.1.0-beta22", + "node-pty": "1.1.0-beta4", "tas-client-umd": "0.2.0", diff --git a/patches/merge-user-product.patch b/patches/merge-user-product.patch index 9fde938..636b248 100644 --- a/patches/merge-user-product.patch +++ b/patches/merge-user-product.patch @@ -1,28 +1,35 @@ -diff --git a/src/main.js b/src/main.js -index 10bd503..4048782 100644 ---- a/src/main.js -+++ b/src/main.js -@@ -132,2 +132,14 @@ registerListeners(); +diff --git a/src/main.ts b/src/main.ts +index 62ddd5f..90c6cfd 100644 +--- a/src/main.ts ++++ b/src/main.ts +@@ -8,2 +8,3 @@ import * as fs from 'original-fs'; + import * as os from 'os'; ++import { createRequire } from 'node:module'; + import { configurePortable } from './bootstrap-node.js'; +@@ -23,2 +24,3 @@ import { NativeParsedArgs } from './vs/platform/environment/common/argv.js'; + const __dirname = path.dirname(fileURLToPath(import.meta.url)); ++const require = createRequire(import.meta.url); + +@@ -103,2 +105,13 @@ registerListeners(); +function resolveUserProduct() { -+ const userDataPath = getUserDataPath({}, product.nameShort ?? 'code-oss-dev'); + const userProductPath = `file:///${userDataPath}/product.json`; + + try { + // Assign the product configuration to the global scope + const productPath = require(fileURLToPath(userProductPath)); -+ global["_VSCODE_USER_PRODUCT_JSON"] = productPath; ++ globalThis._VSCODE_PRODUCT_JSON = productPath; + } catch (ex) { + } +} + /** -@@ -208,2 +220,3 @@ function startup(codeCachePath, nlsConfig) { +@@ -174,2 +188,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || ''; + resolveUserProduct(); diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts -index a98043f..204ce1b 100644 +index 1a2a619..9bf5ac0 100644 --- a/src/vs/platform/product/common/product.ts +++ b/src/vs/platform/product/common/product.ts @@ -29,2 +29,36 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) { diff --git a/product.json b/product.json index 14719a5..163cf34 100644 --- a/product.json +++ b/product.json @@ -202,7 +202,9 @@ "treeViewMarkdownMessage" ], "GitHub.copilot": [ - "inlineCompletionsAdditions" + "inlineCompletionsAdditions", + "interactive", + "terminalDataWriteEvent" ], "GitHub.copilot-nightly": [ "inlineCompletionsAdditions", @@ -314,8 +316,7 @@ "lmTools" ], "redhat.java": [ - "documentPaste", - "lmTools" + "documentPaste" ], "vscjava.vscode-java-pack": [ "lmTools" From 46b4f54548235e2387ca92f5f086ad3a7f272212 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Sun, 13 Oct 2024 21:59:42 +0200 Subject: [PATCH 10/36] feat: signing windows .exe (#2058) --- .github/workflows/insider-windows.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index abea90c..a92cd13 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -99,6 +99,26 @@ jobs: run: ./prepare_assets.sh if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') + - name: Upload unsigned artifacts + id: upload-unsigned-artifacts + uses: actions/upload-artifact@v4 + with: + path: assets/*.exe + retention-days: 1 + if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') + + - name: Signing + uses: signpath/github-action-submit-signing-request@v1 + with: + api-token: '${{ secrets.SIGNPATH_API_TOKEN }}' + organization-id: '${{ secrets.SIGNPATH_ORG_ID }}' + project-slug: '${{ secrets.SIGNPATH_PROJECT_ID }}' + signing-policy-slug: '${{ secrets.SIGNPATH_POLICY_SLUG }}' + github-artifact-id: '${{ steps.upload-unsigned-artifacts.outputs.artifact-id }}' + wait-for-completion: true + output-artifact-directory: assets/ + if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') + - name: Release env: GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }} From 6c5a93fd32e68057b38566d78c04516bb5236ce4 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Sun, 13 Oct 2024 22:52:30 +0200 Subject: [PATCH 11/36] wip: disable msi and rename unsigned artifact [skip ci] --- .github/workflows/insider-windows.yml | 2 ++ check_tags.sh | 20 ++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index a92cd13..7fdc327 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -83,6 +83,7 @@ jobs: - name: Check existing VSCodium tags/releases env: + DISABLE_MSI: ${{ vars.DISABLE_INSIDER_MSI }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: ./check_tags.sh if: env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true' @@ -103,6 +104,7 @@ jobs: id: upload-unsigned-artifacts uses: actions/upload-artifact@v4 with: + name: unsigned-${{ matrix.vscode_arch }} path: assets/*.exe retention-days: 1 if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') diff --git a/check_tags.sh b/check_tags.sh index f7eeb76..b738cbe 100755 --- a/check_tags.sh +++ b/check_tags.sh @@ -163,14 +163,18 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_ZIP="no" fi - if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then + if [[ "${DISABLE_MSI}" == "yes" ]]; then + export SHOULD_BUILD_MSI="no" + elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then echo "Building on Windows ia32 because we have no msi" export SHOULD_BUILD="yes" else export SHOULD_BUILD_MSI="no" fi - if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then + if [[ "${DISABLE_MSI}" == "yes" ]]; then + export SHOULD_BUILD_MSI_NOUP="no" + elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then echo "Building on Windows ia32 because we have no updates-disabled msi" export SHOULD_BUILD="yes" else @@ -218,14 +222,18 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_ZIP="no" fi - if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then + if [[ "${DISABLE_MSI}" == "yes" ]]; then + export SHOULD_BUILD_MSI="no" + elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then echo "Building on Windows x64 because we have no msi" export SHOULD_BUILD="yes" else export SHOULD_BUILD_MSI="no" fi - if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then + if [[ "${DISABLE_MSI}" == "yes" ]]; then + export SHOULD_BUILD_MSI_NOUP="no" + elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then echo "Building on Windows x64 because we have no updates-disabled msi" export SHOULD_BUILD="yes" else @@ -545,6 +553,10 @@ else export SHOULD_BUILD_REH="no" export SHOULD_BUILD_REH_WEB="no" fi + if [[ "${DISABLE_MSI}" == "yes" ]]; then + export SHOULD_BUILD_MSI="no" + export SHOULD_BUILD_MSI_NOUP="no" + fi fi echo "Release assets do not exist at all, continuing build" From aa4d1fe3c9e0f96f766927019aef96e3be5127d3 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Sun, 13 Oct 2024 23:28:57 +0200 Subject: [PATCH 12/36] wip: sign only user installer [skip ci] --- .github/workflows/insider-windows.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index 7fdc327..d89fc67 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -100,23 +100,23 @@ jobs: run: ./prepare_assets.sh if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') - - name: Upload unsigned artifacts - id: upload-unsigned-artifacts + - name: Upload unsigned user artifact + id: upload-unsigned-user-artifact uses: actions/upload-artifact@v4 with: - name: unsigned-${{ matrix.vscode_arch }} - path: assets/*.exe + name: unsigned-user-${{ matrix.vscode_arch }} + path: assets/VSCodiumUserSetup-*.exe retention-days: 1 if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') - - name: Signing + - name: Signing user uses: signpath/github-action-submit-signing-request@v1 with: api-token: '${{ secrets.SIGNPATH_API_TOKEN }}' - organization-id: '${{ secrets.SIGNPATH_ORG_ID }}' - project-slug: '${{ secrets.SIGNPATH_PROJECT_ID }}' + organization-id: '${{ secrets.SIGNPATH_ORGANIZATION_ID }}' + project-slug: '${{ secrets.SIGNPATH_PROJECT_SLUG }}' signing-policy-slug: '${{ secrets.SIGNPATH_POLICY_SLUG }}' - github-artifact-id: '${{ steps.upload-unsigned-artifacts.outputs.artifact-id }}' + github-artifact-id: '${{ steps.upload-unsigned-user-artifact.outputs.artifact-id }}' wait-for-completion: true output-artifact-directory: assets/ if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') From e5d9fa51437e14de589bcb5491938488f380b61f Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Mon, 14 Oct 2024 00:15:36 +0200 Subject: [PATCH 13/36] wip: use correct signpath configuration [skip ci] --- .github/workflows/insider-windows.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index d89fc67..4bb41dc 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -100,23 +100,26 @@ jobs: run: ./prepare_assets.sh if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') - - name: Upload unsigned user artifact - id: upload-unsigned-user-artifact + - name: Upload unsigned artifacts + id: upload-unsigned-artifacts uses: actions/upload-artifact@v4 with: - name: unsigned-user-${{ matrix.vscode_arch }} - path: assets/VSCodiumUserSetup-*.exe + name: unsigned-${{ matrix.vscode_arch }} + path: | + assets/*.exe + assets/*.msi retention-days: 1 if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') - - name: Signing user + - name: Signing uses: signpath/github-action-submit-signing-request@v1 with: api-token: '${{ secrets.SIGNPATH_API_TOKEN }}' organization-id: '${{ secrets.SIGNPATH_ORGANIZATION_ID }}' project-slug: '${{ secrets.SIGNPATH_PROJECT_SLUG }}' signing-policy-slug: '${{ secrets.SIGNPATH_POLICY_SLUG }}' - github-artifact-id: '${{ steps.upload-unsigned-user-artifact.outputs.artifact-id }}' + github-artifact-id: '${{ steps.upload-unsigned-artifacts.outputs.artifact-id }}' + artifact-configuration-slug: '${{ matrix.vscode_arch }}' wait-for-completion: true output-artifact-directory: assets/ if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') From a6cd884c375e51d1245303e1334101fa9321725a Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Mon, 14 Oct 2024 01:03:50 +0200 Subject: [PATCH 14/36] build(windows): calculate checksums after signing [skip ci] --- .github/workflows/insider-windows.yml | 4 ++++ prepare_assets.sh | 24 +++--------------------- prepare_checksums.sh | 23 +++++++++++++++++++++++ 3 files changed, 30 insertions(+), 21 deletions(-) create mode 100755 prepare_checksums.sh diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index 4bb41dc..4282d7e 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -124,6 +124,10 @@ jobs: output-artifact-directory: assets/ if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') + - name: Prepare checksums + run: ./prepare_checksums.sh + if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') + - name: Release env: GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }} diff --git a/prepare_assets.sh b/prepare_assets.sh index fc3eb91..0a5613f 100755 --- a/prepare_assets.sh +++ b/prepare_assets.sh @@ -5,18 +5,6 @@ set -e APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )" -. ./utils.sh - -npm install -g checksum - -sum_file() { - if [[ -f "${1}" ]]; then - echo "Calculating checksum for ${1}" - checksum -a sha256 "${1}" > "${1}".sha256 - checksum "${1}" > "${1}".sha1 - fi -} - mkdir -p assets if [[ "${OS_NAME}" == "osx" ]]; then @@ -226,12 +214,6 @@ if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then cd .. fi -cd assets - -for FILE in *; do - if [[ -f "${FILE}" ]]; then - sum_file "${FILE}" - fi -done - -cd .. +if [[ "${OS_NAME}" != "windows" ]]; then + ./prepare_checksums.sh +fi diff --git a/prepare_checksums.sh b/prepare_checksums.sh new file mode 100755 index 0000000..4d5c6cf --- /dev/null +++ b/prepare_checksums.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +set -e + +npm install -g checksum + +sum_file() { + if [[ -f "${1}" ]]; then + echo "Calculating checksum for ${1}" + checksum -a sha256 "${1}" > "${1}".sha256 + checksum "${1}" > "${1}".sha1 + fi +} + +cd assets + +for FILE in *; do + if [[ -f "${FILE}" ]]; then + sum_file "${FILE}" + fi +done + +cd .. From 929efa9c89d2545a39fe2aa376ada1fc70a168c5 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Mon, 14 Oct 2024 15:12:31 +0200 Subject: [PATCH 15/36] chore: reformat value --- .github/workflows/insider-windows.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index 4282d7e..9a1ebd2 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -114,12 +114,12 @@ jobs: - name: Signing uses: signpath/github-action-submit-signing-request@v1 with: - api-token: '${{ secrets.SIGNPATH_API_TOKEN }}' - organization-id: '${{ secrets.SIGNPATH_ORGANIZATION_ID }}' - project-slug: '${{ secrets.SIGNPATH_PROJECT_SLUG }}' - signing-policy-slug: '${{ secrets.SIGNPATH_POLICY_SLUG }}' - github-artifact-id: '${{ steps.upload-unsigned-artifacts.outputs.artifact-id }}' - artifact-configuration-slug: '${{ matrix.vscode_arch }}' + api-token: ${{ secrets.SIGNPATH_API_TOKEN }} + organization-id: ${{ secrets.SIGNPATH_ORGANIZATION_ID }} + project-slug: ${{ secrets.SIGNPATH_PROJECT_SLUG }} + signing-policy-slug: ${{ secrets.SIGNPATH_POLICY_SLUG }} + github-artifact-id: ${{ steps.upload-unsigned-artifacts.outputs.artifact-id }} + artifact-configuration-slug: ${{ matrix.vscode_arch }} wait-for-completion: true output-artifact-directory: assets/ if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') From 8aa6281b5d88507bfc49e3476795710385ac5306 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Mon, 14 Oct 2024 15:12:38 +0200 Subject: [PATCH 16/36] build: re-enable ppc64 --- .github/workflows/insider-linux.yml | 4 ++-- package_linux_reh.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index 8c77a60..a3dab73 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -266,8 +266,8 @@ jobs: npm_arch: arm64 - vscode_arch: armhf npm_arch: arm - # - vscode_arch: ppc64le - # npm_arch: ppc64 + - vscode_arch: ppc64le + npm_arch: ppc64 - vscode_arch: riscv64 npm_arch: riscv64 env: diff --git a/package_linux_reh.sh b/package_linux_reh.sh index 58b3500..35d48ab 100755 --- a/package_linux_reh.sh +++ b/package_linux_reh.sh @@ -39,7 +39,7 @@ if [[ "${VSCODE_ARCH}" == "x64" || "${VSCODE_ARCH}" == "arm64" ]]; then elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-arm32v7" elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then - VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-ppc64le" + VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-ppc64le" export ELECTRON_SKIP_BINARY_DOWNLOAD=1 export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 export VSCODE_SYSROOT_REPO='VSCodium/vscode-linux-build-agent' From f02532900b75b5daf332b0d3ea82af4b33617e3d Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Mon, 14 Oct 2024 18:47:39 +0200 Subject: [PATCH 17/36] ci: add flag to disable reh build --- .github/workflows/insider-linux.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index a3dab73..d02f090 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -260,15 +260,20 @@ jobs: fail-fast: false matrix: include: - - vscode_arch: x64 + - slug: X64 + vscode_arch: x64 npm_arch: x64 - - vscode_arch: arm64 + - slug: ARM64 + vscode_arch: arm64 npm_arch: arm64 - - vscode_arch: armhf + - slug: ARM + vscode_arch: armhf npm_arch: arm - - vscode_arch: ppc64le + - slug: PPC64 + vscode_arch: ppc64le npm_arch: ppc64 - - vscode_arch: riscv64 + - slug: RISCV64 + vscode_arch: riscv64 npm_arch: riscv64 env: BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }} @@ -278,7 +283,7 @@ jobs: SHOULD_BUILD: ${{ needs.check.outputs.SHOULD_BUILD }} SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }} VSCODE_ARCH: ${{ matrix.vscode_arch }} - if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true' + if: (needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true') && vars[format('DISABLE_INSIDER_LINUX_REH_{0}', matrix.slug)] != 'yes' steps: - uses: actions/checkout@v3 From 773b81f25f8137ff681e519c62fd4d5e4e844b73 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Mon, 14 Oct 2024 18:59:32 +0200 Subject: [PATCH 18/36] ci: add flag to disable reh build --- .github/workflows/insider-linux.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index d02f090..fb07065 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -283,66 +283,78 @@ jobs: SHOULD_BUILD: ${{ needs.check.outputs.SHOULD_BUILD }} SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }} VSCODE_ARCH: ${{ matrix.vscode_arch }} - if: (needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true') && vars[format('DISABLE_INSIDER_LINUX_REH_{0}', matrix.slug)] != 'yes' + if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true' steps: + - name: Check if can run + run: | + echo "ABORT=yes" >> $GITHUB_ENV + if: vars[format('DISABLE_INSIDER_LINUX_REH_{0}', matrix.slug)] != 'yes' + - uses: actions/checkout@v3 with: ref: ${{ env.GITHUB_BRANCH }} + if: env.ABORT != 'yes' - name: Switch to relevant branch env: PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }} run: ./get_pr.sh + if: env.ABORT != 'yes' - name: Setup GCC uses: egor-tensin/setup-gcc@v1 with: version: 10 platform: x64 + if: env.ABORT != 'yes' - name: Setup Node.js environment uses: actions/setup-node@v4 with: node-version: '20.17' + if: env.ABORT != 'yes' - name: Setup Python 3 uses: actions/setup-python@v5 with: python-version: '3.11' + if: env.ABORT != 'yes' - name: Install libkrb5-dev run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev + if: env.ABORT != 'yes' - name: Install GH run: ./install_gh.sh - if: env.SHOULD_DEPLOY == 'yes' + if: env.ABORT != 'yes' && env.SHOULD_DEPLOY == 'yes' - name: Check existing VSCodium tags/releases env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} CHECK_ONLY_REH: 'yes' run: ./check_tags.sh + if: env.ABORT != 'yes' - name: Download vscode artifact uses: actions/download-artifact@v3 with: name: vscode - if: env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true' + if: env.ABORT != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true') - name: Build env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} npm_config_arch: ${{ matrix.npm_arch }} run: ./package_linux_reh.sh - if: env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true' + if: env.ABORT != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true') - name: Release env: GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }} GITHUB_USERNAME: ${{ github.repository_owner }} run: ./release.sh - if: (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no') && env.SHOULD_DEPLOY == 'yes' + if: env.ABORT != 'yes' && env.SHOULD_DEPLOY == 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no') - name: Upload assets uses: actions/upload-artifact@v4 @@ -350,7 +362,7 @@ jobs: name: reh-linux-${{ matrix.vscode_arch }} path: assets/ retention-days: 3 - if: env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true' + if: env.ABORT != 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true' reh_alpine: needs: From b4943a7ef593a303c79d382f1b3ebadff68d7639 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Mon, 14 Oct 2024 19:22:50 +0200 Subject: [PATCH 19/36] ci: fix condition --- .github/workflows/insider-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index fb07065..da65a2e 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -289,7 +289,7 @@ jobs: - name: Check if can run run: | echo "ABORT=yes" >> $GITHUB_ENV - if: vars[format('DISABLE_INSIDER_LINUX_REH_{0}', matrix.slug)] != 'yes' + if: vars[format('DISABLE_INSIDER_LINUX_REH_{0}', matrix.slug)] == 'yes' - uses: actions/checkout@v3 with: From 8386f6057b0c36add9e9df468292c4a86e5d0d0a Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Mon, 14 Oct 2024 19:26:57 +0200 Subject: [PATCH 20/36] ci: directly set the env variable to disable steps --- .github/workflows/insider-linux.yml | 30 +++++++++++++---------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index da65a2e..18b9cee 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -277,6 +277,7 @@ jobs: npm_arch: riscv64 env: BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }} + DISABLED: ${{ vars[format('DISABLE_INSIDER_LINUX_REH_{0}', matrix.slug)] }} MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }} MS_TAG: ${{ needs.check.outputs.MS_TAG }} RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }} @@ -286,75 +287,70 @@ jobs: if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true' steps: - - name: Check if can run - run: | - echo "ABORT=yes" >> $GITHUB_ENV - if: vars[format('DISABLE_INSIDER_LINUX_REH_{0}', matrix.slug)] == 'yes' - - uses: actions/checkout@v3 with: ref: ${{ env.GITHUB_BRANCH }} - if: env.ABORT != 'yes' + if: env.DISABLED != 'yes' - name: Switch to relevant branch env: PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }} run: ./get_pr.sh - if: env.ABORT != 'yes' + if: env.DISABLED != 'yes' - name: Setup GCC uses: egor-tensin/setup-gcc@v1 with: version: 10 platform: x64 - if: env.ABORT != 'yes' + if: env.DISABLED != 'yes' - name: Setup Node.js environment uses: actions/setup-node@v4 with: node-version: '20.17' - if: env.ABORT != 'yes' + if: env.DISABLED != 'yes' - name: Setup Python 3 uses: actions/setup-python@v5 with: python-version: '3.11' - if: env.ABORT != 'yes' + if: env.DISABLED != 'yes' - name: Install libkrb5-dev run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev - if: env.ABORT != 'yes' + if: env.DISABLED != 'yes' - name: Install GH run: ./install_gh.sh - if: env.ABORT != 'yes' && env.SHOULD_DEPLOY == 'yes' + if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes' - name: Check existing VSCodium tags/releases env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} CHECK_ONLY_REH: 'yes' run: ./check_tags.sh - if: env.ABORT != 'yes' + if: env.DISABLED != 'yes' - name: Download vscode artifact uses: actions/download-artifact@v3 with: name: vscode - if: env.ABORT != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true') + if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true') - name: Build env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} npm_config_arch: ${{ matrix.npm_arch }} run: ./package_linux_reh.sh - if: env.ABORT != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true') + if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true') - name: Release env: GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }} GITHUB_USERNAME: ${{ github.repository_owner }} run: ./release.sh - if: env.ABORT != 'yes' && env.SHOULD_DEPLOY == 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no') + if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no') - name: Upload assets uses: actions/upload-artifact@v4 @@ -362,7 +358,7 @@ jobs: name: reh-linux-${{ matrix.vscode_arch }} path: assets/ retention-days: 3 - if: env.ABORT != 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true' + if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true' reh_alpine: needs: From 9eff6e1bc04d4bd4bbe9defc42745a045ab64f40 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Sat, 19 Oct 2024 09:18:19 +0200 Subject: [PATCH 21/36] feat(1.95): update patches (#2066) --- insider.json | 2 +- patches/crash-reporter.patch | 8 ++++++-- patches/merge-user-product.patch | 17 +++++++++-------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/insider.json b/insider.json index 553d16d..4462c03 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { "tag": "1.95.0", - "commit": "a016ec9b66ffdd3ff0f831768b8e75be008a54e4" + "commit": "c85acdad6b679973c79b01a38afa91448c705c1c" } diff --git a/patches/crash-reporter.patch b/patches/crash-reporter.patch index 8c9a786..c187bf9 100644 --- a/patches/crash-reporter.patch +++ b/patches/crash-reporter.patch @@ -1,10 +1,14 @@ diff --git a/src/main.ts b/src/main.ts -index 62ddd5f..a6fc3c5 100644 +index ff9a5e8..6fb7fd2 100644 --- a/src/main.ts +++ b/src/main.ts -@@ -461,2 +461,5 @@ function configureCrashReporter(): void { +@@ -467,6 +467,9 @@ function configureCrashReporter(): void { + } + } } + else { + return; + } } + + // Start crash reporter for all processes diff --git a/patches/merge-user-product.patch b/patches/merge-user-product.patch index 636b248..652d86d 100644 --- a/patches/merge-user-product.patch +++ b/patches/merge-user-product.patch @@ -1,30 +1,31 @@ diff --git a/src/main.ts b/src/main.ts -index 62ddd5f..90c6cfd 100644 +index ff9a5e8..2135d00 100644 --- a/src/main.ts +++ b/src/main.ts @@ -8,2 +8,3 @@ import * as fs from 'original-fs'; import * as os from 'os'; +import { createRequire } from 'node:module'; - import { configurePortable } from './bootstrap-node.js'; -@@ -23,2 +24,3 @@ import { NativeParsedArgs } from './vs/platform/environment/common/argv.js'; + import { performance } from 'perf_hooks'; +@@ -24,2 +25,3 @@ import { NativeParsedArgs } from './vs/platform/environment/common/argv.js'; const __dirname = path.dirname(fileURLToPath(import.meta.url)); +const require = createRequire(import.meta.url); -@@ -103,2 +105,13 @@ registerListeners(); +@@ -112,2 +114,14 @@ registerListeners(); +function resolveUserProduct() { -+ const userProductPath = `file:///${userDataPath}/product.json`; ++ const userProductPath = path.join(userDataPath, 'product.json'); + + try { + // Assign the product configuration to the global scope -+ const productPath = require(fileURLToPath(userProductPath)); -+ globalThis._VSCODE_PRODUCT_JSON = productPath; ++ const productJson = require(userProductPath); ++ // @ts-expect-error ++ globalThis._VSCODE_USER_PRODUCT_JSON = productJson; + } catch (ex) { + } +} + /** -@@ -174,2 +188,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu +@@ -183,2 +197,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || ''; + resolveUserProduct(); From b10b54d0bede3f67d5de0bea35d45ed9d3af9239 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 22 Oct 2024 15:53:04 +0200 Subject: [PATCH 22/36] build(windows): add signing with SignPath (#2069) --- .github/workflows/insider-windows.yml | 1 - .github/workflows/stable-windows.yml | 31 +++++++++++++++++++++++++-- README.md | 4 ++++ 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index 9a1ebd2..bf13990 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -44,7 +44,6 @@ jobs: matrix: vscode_arch: - x64 - # - ia32 - arm64 outputs: RELEASE_VERSION: ${{ env.RELEASE_VERSION }} diff --git a/.github/workflows/stable-windows.yml b/.github/workflows/stable-windows.yml index 3f7e283..22ff178 100644 --- a/.github/workflows/stable-windows.yml +++ b/.github/workflows/stable-windows.yml @@ -30,7 +30,6 @@ env: VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions VSCODE_QUALITY: stable - jobs: build: runs-on: windows-2019 @@ -44,7 +43,6 @@ jobs: matrix: vscode_arch: - x64 - # - ia32 - arm64 outputs: RELEASE_VERSION: ${{ env.RELEASE_VERSION }} @@ -83,6 +81,7 @@ jobs: - name: Check existing VSCodium tags/releases env: + DISABLE_MSI: ${{ vars.DISABLE_STABLE_MSI }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: ./check_tags.sh if: env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true' @@ -99,6 +98,34 @@ jobs: run: ./prepare_assets.sh if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') + - name: Upload unsigned artifacts + id: upload-unsigned-artifacts + uses: actions/upload-artifact@v4 + with: + name: unsigned-${{ matrix.vscode_arch }} + path: | + assets/*.exe + assets/*.msi + retention-days: 1 + if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') + + - name: Signing + uses: signpath/github-action-submit-signing-request@v1 + with: + api-token: ${{ secrets.SIGNPATH_API_TOKEN }} + organization-id: ${{ secrets.SIGNPATH_ORGANIZATION_ID }} + project-slug: ${{ secrets.SIGNPATH_PROJECT_SLUG }} + signing-policy-slug: ${{ secrets.SIGNPATH_POLICY_SLUG }} + github-artifact-id: ${{ steps.upload-unsigned-artifacts.outputs.artifact-id }} + artifact-configuration-slug: ${{ matrix.vscode_arch }} + wait-for-completion: true + output-artifact-directory: assets/ + if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') + + - name: Prepare checksums + run: ./prepare_checksums.sh + if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') + - name: Release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 280f964..bbdd189 100644 --- a/README.md +++ b/README.md @@ -204,6 +204,10 @@ The minimal version is limited by the core component Electron, you may want to c MacStadium logo for providing a Mac mini M1 + + + SignPath logo + for Windows certificate @daiyam From 3d2a91c6939696110d4507b14bf3c7be54cda1b7 Mon Sep 17 00:00:00 2001 From: VSCodium CI Date: Tue, 22 Oct 2024 14:04:15 +0000 Subject: [PATCH 23/36] build(insider): update to commit defe52d --- insider.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/insider.json b/insider.json index 4462c03..f220eb3 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { "tag": "1.95.0", - "commit": "c85acdad6b679973c79b01a38afa91448c705c1c" + "commit": "defe52dc43e6f5d861f55600ff01f7553fac7eaf" } From 656d6cea58c778cb924cbf3d047775c3de6d7e3e Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Wed, 23 Oct 2024 02:27:04 +0200 Subject: [PATCH 24/36] feat(linux): update XDG_RUNTIME_DIR for flatpak (#2071) --- patches/linux/client/update-xdg-path.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 patches/linux/client/update-xdg-path.patch diff --git a/patches/linux/client/update-xdg-path.patch b/patches/linux/client/update-xdg-path.patch new file mode 100644 index 0000000..6068c10 --- /dev/null +++ b/patches/linux/client/update-xdg-path.patch @@ -0,0 +1,22 @@ +diff --git a/extensions/git/src/ipc/ipcServer.ts b/extensions/git/src/ipc/ipcServer.ts +index a7142fe..526ca17 100644 +--- a/extensions/git/src/ipc/ipcServer.ts ++++ b/extensions/git/src/ipc/ipcServer.ts +@@ -20,3 +20,7 @@ function getIPCHandlePath(id: string): string { + if (process.platform !== 'darwin' && process.env['XDG_RUNTIME_DIR']) { +- return path.join(process.env['XDG_RUNTIME_DIR'] as string, `vscode-git-${id}.sock`); ++ if (!!process.env.FLATPAK_ID) { ++ return path.join(process.env['XDG_RUNTIME_DIR'] as string, 'app', process.env.FLATPAK_ID, `vscode-git-${id}.sock`); ++ } else { ++ return path.join(process.env['XDG_RUNTIME_DIR'] as string, `vscode-git-${id}.sock`); ++ } + } +diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts +index 629f2c4..ec1acba 100644 +--- a/src/vs/base/parts/ipc/node/ipc.net.ts ++++ b/src/vs/base/parts/ipc/node/ipc.net.ts +@@ -774,3 +774,3 @@ function unmask(buffer: VSBuffer, mask: number): void { + // Related to https://github.com/microsoft/vscode/issues/30624 +-export const XDG_RUNTIME_DIR = process.env['XDG_RUNTIME_DIR']; ++export const XDG_RUNTIME_DIR = (!!process.env.FLATPAK_ID ? join(process.env['XDG_RUNTIME_DIR'] as string, 'app', process.env.FLATPAK_ID) : process.env['XDG_RUNTIME_DIR']); + From c910d1447d67a8370ef263e367244a2256089523 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Wed, 23 Oct 2024 09:43:39 +0200 Subject: [PATCH 25/36] fix: update patches --- patches/brand.patch | 60 +++++++++++++++++------------------ patches/linux/fix-build.patch | 13 +++++--- product.json | 13 ++------ 3 files changed, 42 insertions(+), 44 deletions(-) diff --git a/patches/brand.patch b/patches/brand.patch index ef0ff94..ddd5009 100644 --- a/patches/brand.patch +++ b/patches/brand.patch @@ -359,11 +359,11 @@ index b18b340..ca2eb2d 100644 + "comment": "The simpler (?<=\\bProcess\\.|\\bCommandLine\\.) breaks VSCodium / Atom, see https://github.com/textmate/swift.tmbundle/issues/29", "name": "support.variable.swift", diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json -index 4a62db6..233fb1f 100644 +index 4027c81..6885e91 100644 --- a/extensions/typescript-language-features/package.nls.json +++ b/extensions/typescript-language-features/package.nls.json @@ -75,4 +75,4 @@ - "configuration.tsserver.experimental.enableProjectDiagnostics": "(Experimental) Enables project wide error reporting.", + "configuration.tsserver.experimental.enableProjectDiagnostics": "Enables project wide error reporting.", - "typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use VS Code's locale.", - "typescript.locale.auto": "Use VS Code's configured display language", + "typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use VSCodium's locale.", @@ -432,20 +432,20 @@ index e85c715..9059335 100644 + vscode.l10n.t("Please open a folder in VSCodium to use a TypeScript or JavaScript project")); return; diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts -index a1f06a3..4d04671 100644 +index b5fdb18..22cb40c 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts -@@ -664,3 +664,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType +@@ -663,3 +663,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType prompt = vscode.window.showErrorMessage( - vscode.l10n.t("The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList)); + vscode.l10n.t("The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList)); } else { -@@ -685,3 +685,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType +@@ -684,3 +684,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType prompt = vscode.window.showWarningMessage( - vscode.l10n.t("The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList)); + vscode.l10n.t("The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList)); } else { -@@ -699,3 +699,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType +@@ -698,3 +698,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType prompt = vscode.window.showWarningMessage( - vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList)); + vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList)); @@ -529,10 +529,10 @@ index fa001b5..13abac2 100644 + throw Error(`Failed to download and unzip VSCodium ${quality} - ${commit}`); } diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts -index ebf401d..bed25b5 100644 +index 603edcc..9f67963 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts -@@ -532,3 +532,3 @@ export class CodeApplication extends Disposable { +@@ -543,3 +543,3 @@ export class CodeApplication extends Disposable { async startup(): Promise { - this.logService.debug('Starting VS Code'); + this.logService.debug('Starting VSCodium'); @@ -644,10 +644,10 @@ index d3f27d3..6a7e37a 100644 + comment: 'This is used to know how often VSCodium has successfully downloaded the update.'; }; diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts -index 9314c9d..c3ee8de 100644 +index 6e2da22..da82b84 100644 --- a/src/vs/server/node/server.cli.ts +++ b/src/vs/server/node/server.cli.ts -@@ -455,3 +455,3 @@ function asExtensionIdOrVSIX(inputs: string[] | undefined) { +@@ -457,3 +457,3 @@ function asExtensionIdOrVSIX(inputs: string[] | undefined) { function fatal(message: string, err: any): void { - console.error('Unable to connect to VS Code server: ' + message); + console.error('Unable to connect to VSCodium server: ' + message); @@ -689,10 +689,10 @@ index 54b14a3..c075afb 100644 + test('Opening a notebook results in VSCodium firing the event onDidChangeActiveNotebookEditor twice #118470', function () { let count = 0; diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts -index 30699b3..cd6647a 100644 +index 4d2143e..d712f4a 100644 --- a/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts -@@ -658,3 +658,3 @@ const registry = Registry.as(ConfigurationExtensions.Con +@@ -654,3 +654,3 @@ const registry = Registry.as(ConfigurationExtensions.Con localize('profileName', "`${profileName}`: name of the profile in which the workspace is opened (e.g. Data Science (Profile)). Ignored if default profile is used."), - localize('appName', "`${appName}`: e.g. VS Code."), + localize('appName', "`${appName}`: e.g. VSCodium."), @@ -979,7 +979,7 @@ index c0a82e3..b0b75e4 100644 + description: localize('suggest.builtinCompletions.pwshCode', 'Custom PowerShell argument completers will be registered for VSCodium\'s `codium` and `codium-insiders` CLIs. This is currently very basic and always suggests flags and subcommands without checking context.'), type: 'boolean' diff --git a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts -index 9359908..7bab151 100644 +index 9a7b334..7a9aee9 100644 --- a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts +++ b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts @@ -914,3 +914,3 @@ class DefaultThemeUpdatedNotificationContribution implements IWorkbenchContribut @@ -1046,15 +1046,15 @@ index 3f1c098..3b2a175 100644 + description: localize('walkthroughs.steps.completionEvents.onCommand', 'Check off step when a given command is executed anywhere in VSCodium.'), body: 'onCommand:${1:commandId}' diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts -index 0f8c49a..c8eec3a 100644 +index 9628466..2ab04b1 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts -@@ -213,3 +213,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -214,3 +214,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ id: 'Setup', - title: localize('gettingStarted.setup.title', "Get Started with VS Code"), + title: localize('gettingStarted.setup.title', "Get Started with VSCodium"), description: localize('gettingStarted.setup.description', "Customize your editor, learn the basics, and start coding"), -@@ -235,6 +235,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -237,6 +237,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.extensions.title', "Code with extensions"), - description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VS Code's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), + description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VSCodium's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), @@ -1063,7 +1063,7 @@ index 0f8c49a..c8eec3a 100644 - type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions-web.svg' + type: 'svg', altText: 'VSCodium extension marketplace with featured language extensions', path: 'extensions-web.svg' }, -@@ -253,5 +253,5 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -255,5 +255,5 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.settings.title', "Tune your settings"), - description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), + description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VSCodium and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), @@ -1071,34 +1071,34 @@ index 0f8c49a..c8eec3a 100644 - type: 'svg', altText: 'VS Code Settings', path: 'settings.svg' + type: 'svg', altText: 'VSCodium Settings', path: 'settings.svg' }, -@@ -271,3 +271,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -273,3 +273,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.commandPalette.title', "Unlock productivity with the Command Palette "), - description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), + description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VSCodium.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' }, -@@ -277,3 +277,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -279,3 +279,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), - description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')), + description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VSCodium.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')), when: 'isMac && workspaceFolderCount == 0', -@@ -286,3 +286,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -288,3 +288,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), - description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')), + description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VSCodium.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')), when: '!isMac && workspaceFolderCount == 0', -@@ -304,4 +304,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -306,4 +306,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.videoTutorial.title', "Watch video tutorials"), - description: localize('gettingStarted.videoTutorial.description.interpolated', "Watch the first in a series of short & practical video tutorials for VS Code's key features.\n{0}", Button(localize('watch', "Watch Tutorial"), 'https://aka.ms/vscode-getting-started-video')), - media: { type: 'svg', altText: 'VS Code Settings', path: 'learn.svg' }, + description: localize('gettingStarted.videoTutorial.description.interpolated', "Watch the first in a series of short & practical video tutorials for VSCodium's key features.\n{0}", Button(localize('watch', "Watch Tutorial"), 'https://aka.ms/vscode-getting-started-video')), + media: { type: 'svg', altText: 'VSCodium Settings', path: 'learn.svg' }, } -@@ -313,3 +313,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -315,3 +315,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ id: 'SetupWeb', - title: localize('gettingStarted.setupWeb.title', "Get Started with VS Code for the Web"), + title: localize('gettingStarted.setupWeb.title', "Get Started with VSCodium for the Web"), description: localize('gettingStarted.setupWeb.description', "Customize your editor, learn the basics, and start coding"), -@@ -344,6 +344,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -347,6 +347,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.extensions.title', "Code with extensions"), - description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VS Code's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), + description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VSCodium's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), @@ -1107,22 +1107,22 @@ index 0f8c49a..c8eec3a 100644 - type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions-web.svg' + type: 'svg', altText: 'VSCodium extension marketplace with featured language extensions', path: 'extensions-web.svg' }, -@@ -372,3 +372,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -375,3 +375,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.commandPalette.title', "Unlock productivity with the Command Palette "), - description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), + description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VSCodium.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' }, -@@ -378,3 +378,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -381,3 +381,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), - description: localize('gettingStarted.setup.OpenFolderWeb.description.interpolated', "You're all set to start coding. You can open a local project or a remote repository to get your files into VS Code.\n{0}\n{1}", Button(localize('openFolder', "Open Folder"), 'command:workbench.action.addRootFolder'), Button(localize('openRepository', "Open Repository"), 'command:remoteHub.openRepository')), + description: localize('gettingStarted.setup.OpenFolderWeb.description.interpolated', "You're all set to start coding. You can open a local project or a remote repository to get your files into VSCodium.\n{0}\n{1}", Button(localize('openFolder', "Open Folder"), 'command:workbench.action.addRootFolder'), Button(localize('openRepository', "Open Repository"), 'command:remoteHub.openRepository')), when: 'workspaceFolderCount == 0', -@@ -399,3 +399,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -402,3 +402,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.setupAccessibility.title', "Get Started with Accessibility Features"), - description: localize('gettingStarted.setupAccessibility.description', "Learn the tools and shortcuts that make VS Code accessible. Note that some actions are not actionable from within the context of the walkthrough."), + description: localize('gettingStarted.setupAccessibility.description', "Learn the tools and shortcuts that make VSCodium accessible. Note that some actions are not actionable from within the context of the walkthrough."), isFeatured: true, -@@ -506,6 +506,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -511,6 +511,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.extensions.title', "Code with extensions"), - description: localize('gettingStarted.extensions.description.interpolated', "Extensions are VS Code's power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}", Button(localize('browsePopular', "Browse Popular Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), + description: localize('gettingStarted.extensions.description.interpolated', "Extensions are VSCodium's power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}", Button(localize('browsePopular', "Browse Popular Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), @@ -1170,15 +1170,15 @@ index 0ab6828..6c8b5ef 100644 + markdownDescription: localize('workspace.trust.emptyWindow.description', "Controls whether or not the empty window is trusted by default within VSCodium. When used with `#{0}#`, you can enable the full functionality of VSCodium without prompting in an empty window.", WORKSPACE_TRUST_UNTRUSTED_FILES), tags: [WORKSPACE_TRUST_SETTING_TAG], diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts -index b638748..13af28d 100644 +index 60b0276..db5bbc1 100644 --- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts +++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts -@@ -402,3 +402,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s +@@ -403,3 +403,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s type: 'boolean', - description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running VS Code as elevated on Linux and running under Applocker on Windows.") + description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running VSCodium as elevated on Linux and running under Applocker on Windows.") }, -@@ -406,3 +406,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s +@@ -407,3 +407,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s type: 'boolean', - description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running VS Code extension tests or when you're experiencing difficulties with the credential store.") + description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running VSCodium extension tests or when you're experiencing difficulties with the credential store.") diff --git a/patches/linux/fix-build.patch b/patches/linux/fix-build.patch index 69ba0e7..b9ba906 100644 --- a/patches/linux/fix-build.patch +++ b/patches/linux/fix-build.patch @@ -19,21 +19,21 @@ index fb0e5a4..412a6cc 100644 + const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch))); gulp.task(buildRpmTask); diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js -index 374c9b6..da5ef4d 100644 +index 80b11b3..0a0ca71 100644 --- a/build/linux/dependencies-generator.js +++ b/build/linux/dependencies-generator.js @@ -24,3 +24,3 @@ const product = require("../../product.json"); // are valid, are in dep-lists.ts -const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true; +const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false; - // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.162:chrome/installer/linux/BUILD.gn;l=64-80 + // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.186:chrome/installer/linux/BUILD.gn;l=64-80 @@ -57,3 +57,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) { // Add the tunnel binary. - files.push(path.join(buildDir, 'bin', product.tunnelApplicationName)); + // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName)); // Add the main executable. diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts -index 3c7f6f5..cd33e87 100644 +index 3163aee..dca1845 100644 --- a/build/linux/dependencies-generator.ts +++ b/build/linux/dependencies-generator.ts @@ -25,3 +25,3 @@ import product = require('../../product.json'); @@ -47,9 +47,14 @@ index 3c7f6f5..cd33e87 100644 + // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName)); // Add the main executable. diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template -index a73bc02..340b94e 100644 +index a73bc02..242bab0 100644 --- a/resources/linux/rpm/code.spec.template +++ b/resources/linux/rpm/code.spec.template +@@ -2,3 +2,3 @@ Name: @@NAME@@ + Version: @@VERSION@@ +-Release: @@RELEASE@@.el8 ++Release: @@RELEASE@@.el9 + Summary: Code editing. Redefined. @@ -88 +88,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_datadir}/zsh/site-functions/_%{name} + diff --git a/product.json b/product.json index 163cf34..31e8158 100644 --- a/product.json +++ b/product.json @@ -202,14 +202,10 @@ "treeViewMarkdownMessage" ], "GitHub.copilot": [ - "inlineCompletionsAdditions", - "interactive", - "terminalDataWriteEvent" + "inlineCompletionsAdditions" ], "GitHub.copilot-nightly": [ - "inlineCompletionsAdditions", - "interactive", - "terminalDataWriteEvent" + "inlineCompletionsAdditions" ], "GitHub.copilot-chat": [ "interactive", @@ -217,11 +213,11 @@ "terminalExecuteCommandEvent", "terminalSelection", "terminalQuickFixProvider", - "chatProvider", "chatParticipantAdditions", "defaultChatParticipant", "embeddings", "chatVariableResolver", + "chatProvider", "mappedEditsProvider", "aiRelatedInformation", "codeActionAI", @@ -260,9 +256,6 @@ "textSearchProvider", "timeline" ], - "GitHub.copilot-nes": [ - "inlineEdit" - ], "ms-python.gather": [ "notebookCellExecutionState" ], From 4418bab70287081f01352cc53b98723150ed954e Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Wed, 23 Oct 2024 10:14:47 +0200 Subject: [PATCH 26/36] ci: update nodejs version [skip ci] --- .github/workflows/insider-macos.yml | 2 +- .github/workflows/insider-spearhead.yml | 2 +- .github/workflows/insider-windows.yml | 2 +- .github/workflows/stable-macos.yml | 2 +- .github/workflows/stable-spearhead.yml | 2 +- .github/workflows/stable-windows.yml | 2 +- .nvmrc | 2 +- insider.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/insider-macos.yml b/.github/workflows/insider-macos.yml index 1e93b6c..d39447b 100644 --- a/.github/workflows/insider-macos.yml +++ b/.github/workflows/insider-macos.yml @@ -59,7 +59,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.12' + node-version: '20.18' - name: Setup Python 3 uses: actions/setup-python@v5 diff --git a/.github/workflows/insider-spearhead.yml b/.github/workflows/insider-spearhead.yml index 185f5a8..1a487cb 100644 --- a/.github/workflows/insider-spearhead.yml +++ b/.github/workflows/insider-spearhead.yml @@ -38,7 +38,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.12' + node-version: '20.18' - name: Clone VSCode repo run: . get_repo.sh diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index bf13990..66d0417 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -62,7 +62,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.12' + node-version: '20.18' - name: Install Yarn run: npm install -g yarn diff --git a/.github/workflows/stable-macos.yml b/.github/workflows/stable-macos.yml index d7756a6..7db769a 100644 --- a/.github/workflows/stable-macos.yml +++ b/.github/workflows/stable-macos.yml @@ -58,7 +58,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.12' + node-version: '20.18' - name: Setup Python 3 uses: actions/setup-python@v5 diff --git a/.github/workflows/stable-spearhead.yml b/.github/workflows/stable-spearhead.yml index e00a0ab..c975b44 100644 --- a/.github/workflows/stable-spearhead.yml +++ b/.github/workflows/stable-spearhead.yml @@ -33,7 +33,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.12' + node-version: '20.18' - name: Clone VSCode repo run: . get_repo.sh diff --git a/.github/workflows/stable-windows.yml b/.github/workflows/stable-windows.yml index 22ff178..85c1fe1 100644 --- a/.github/workflows/stable-windows.yml +++ b/.github/workflows/stable-windows.yml @@ -61,7 +61,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.12' + node-version: '20.18' - name: Install Yarn run: npm install -g yarn diff --git a/.nvmrc b/.nvmrc index c61a3d7..10fef25 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.14 +20.18 diff --git a/insider.json b/insider.json index f220eb3..c304714 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { "tag": "1.95.0", - "commit": "defe52dc43e6f5d861f55600ff01f7553fac7eaf" + "commit": "fe997185b5e6db94693ed6ef5456cfa4e8211edf" } From 33a2643e1b9ba230ccb02a290e55ad1d0b0ab1df Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Wed, 23 Oct 2024 11:22:55 +0200 Subject: [PATCH 27/36] fix: correct rpm patch and increase signing timeout [skip ci] --- .github/workflows/insider-windows.yml | 2 ++ .github/workflows/stable-windows.yml | 2 ++ patches/linux/fix-build.patch | 15 +-------------- patches/linux/rpm.patch | 9 +++++++-- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index 66d0417..8d4e824 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -120,6 +120,8 @@ jobs: github-artifact-id: ${{ steps.upload-unsigned-artifacts.outputs.artifact-id }} artifact-configuration-slug: ${{ matrix.vscode_arch }} wait-for-completion: true + # 3h to manually approve the request + wait-for-completion-timeout-in-seconds: 10800 output-artifact-directory: assets/ if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') diff --git a/.github/workflows/stable-windows.yml b/.github/workflows/stable-windows.yml index 85c1fe1..f8d09e9 100644 --- a/.github/workflows/stable-windows.yml +++ b/.github/workflows/stable-windows.yml @@ -119,6 +119,8 @@ jobs: github-artifact-id: ${{ steps.upload-unsigned-artifacts.outputs.artifact-id }} artifact-configuration-slug: ${{ matrix.vscode_arch }} wait-for-completion: true + # 3h to manually approve the request + wait-for-completion-timeout-in-seconds: 10800 output-artifact-directory: assets/ if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') diff --git a/patches/linux/fix-build.patch b/patches/linux/fix-build.patch index b9ba906..8d356d4 100644 --- a/patches/linux/fix-build.patch +++ b/patches/linux/fix-build.patch @@ -46,17 +46,4 @@ index 3163aee..dca1845 100644 - files.push(path.join(buildDir, 'bin', product.tunnelApplicationName)); + // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName)); // Add the main executable. -diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template -index a73bc02..242bab0 100644 ---- a/resources/linux/rpm/code.spec.template -+++ b/resources/linux/rpm/code.spec.template -@@ -2,3 +2,3 @@ Name: @@NAME@@ - Version: @@VERSION@@ --Release: @@RELEASE@@.el8 -+Release: @@RELEASE@@.el9 - Summary: Code editing. Redefined. -@@ -88 +88,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || : - %{_datadir}/zsh/site-functions/_%{name} -+ -+%config(noreplace) /usr/share/%{name}/resources/app/product.json -\ No newline at end of file + \ No newline at end of file diff --git a/patches/linux/rpm.patch b/patches/linux/rpm.patch index f00a9c9..8d546ad 100644 --- a/patches/linux/rpm.patch +++ b/patches/linux/rpm.patch @@ -1,9 +1,14 @@ diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template -index c9e57db..ef27166 100644 +index a73bc02..242bab0 100644 --- a/resources/linux/rpm/code.spec.template +++ b/resources/linux/rpm/code.spec.template @@ -2,3 +2,3 @@ Name: @@NAME@@ Version: @@VERSION@@ -Release: @@RELEASE@@.el8 -+Release: el8 ++Release: el9 Summary: Code editing. Redefined. +@@ -88 +88,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || : + %{_datadir}/zsh/site-functions/_%{name} ++ ++%config(noreplace) /usr/share/%{name}/resources/app/product.json +\ No newline at end of file From 34a8803363957ba7bd287ea36c877a2b3c6122f6 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Wed, 23 Oct 2024 17:07:32 +0200 Subject: [PATCH 28/36] fix(linux): move patch so it's enabled during compile job (#2073) --- patches/linux/{client => }/update-xdg-path.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename patches/linux/{client => }/update-xdg-path.patch (100%) diff --git a/patches/linux/client/update-xdg-path.patch b/patches/linux/update-xdg-path.patch similarity index 100% rename from patches/linux/client/update-xdg-path.patch rename to patches/linux/update-xdg-path.patch From 9ed563921b36a31e7652d6490fea0de9b82b2f95 Mon Sep 17 00:00:00 2001 From: VSCodium CI Date: Thu, 24 Oct 2024 08:30:44 +0000 Subject: [PATCH 29/36] build(insider): update to commit 39fd376 --- insider.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/insider.json b/insider.json index c304714..0dcbcc0 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { "tag": "1.95.0", - "commit": "fe997185b5e6db94693ed6ef5456cfa4e8211edf" + "commit": "39fd376a04ae461e1abb4212d6395d7a56959198" } From 7fbe30a3f5f418ea58b0935f0fbff51ef6db4461 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 29 Oct 2024 00:12:58 +0100 Subject: [PATCH 30/36] ci: support vars.DISABLE_STABLE_LINUX_REH_ --- .github/workflows/stable-linux.yml | 35 ++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml index 66f7885..4ea18d8 100644 --- a/.github/workflows/stable-linux.yml +++ b/.github/workflows/stable-linux.yml @@ -259,18 +259,24 @@ jobs: fail-fast: false matrix: include: - - vscode_arch: x64 + - slug: X64 + vscode_arch: x64 npm_arch: x64 - - vscode_arch: arm64 + - slug: ARM64 + vscode_arch: arm64 npm_arch: arm64 - - vscode_arch: armhf + - slug: ARM + vscode_arch: armhf npm_arch: arm - # - vscode_arch: ppc64le - # npm_arch: ppc64 - - vscode_arch: riscv64 + - slug: PPC64 + vscode_arch: ppc64le + npm_arch: ppc64 + - slug: RISCV64 + vscode_arch: riscv64 npm_arch: riscv64 env: BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }} + DISABLED: ${{ vars[format('DISABLE_STABLE_LINUX_REH_{0}', matrix.slug)] }} MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }} MS_TAG: ${{ needs.check.outputs.MS_TAG }} RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }} @@ -283,60 +289,67 @@ jobs: - uses: actions/checkout@v3 with: ref: ${{ env.GITHUB_BRANCH }} + if: env.DISABLED != 'yes' - name: Switch to relevant branch env: PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }} run: ./get_pr.sh + if: env.DISABLED != 'yes' - name: Setup GCC uses: egor-tensin/setup-gcc@v1 with: version: 10 platform: x64 + if: env.DISABLED != 'yes' - name: Setup Node.js environment uses: actions/setup-node@v4 with: node-version: '20.17' + if: env.DISABLED != 'yes' - name: Setup Python 3 uses: actions/setup-python@v5 with: python-version: '3.11' + if: env.DISABLED != 'yes' - name: Install libkrb5-dev run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev + if: env.DISABLED != 'yes' - name: Install GH run: ./install_gh.sh - if: env.SHOULD_DEPLOY == 'yes' + if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes' - name: Check existing VSCodium tags/releases env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} CHECK_ONLY_REH: 'yes' run: ./check_tags.sh + if: env.DISABLED != 'yes' - name: Download vscode artifact uses: actions/download-artifact@v3 with: name: vscode - if: env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true' + if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true') - name: Build env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} npm_config_arch: ${{ matrix.npm_arch }} run: ./package_linux_reh.sh - if: env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true' + if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true') - name: Release env: GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }} GITHUB_USERNAME: ${{ github.repository_owner }} run: ./release.sh - if: (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no') && env.SHOULD_DEPLOY == 'yes' + if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no') - name: Upload assets uses: actions/upload-artifact@v4 @@ -344,7 +357,7 @@ jobs: name: reh-linux-${{ matrix.vscode_arch }} path: assets/ retention-days: 3 - if: env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true' + if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true' reh_alpine: needs: From 85ce7aa131812b50eb03254d6f87649afee31bb0 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 29 Oct 2024 00:18:40 +0100 Subject: [PATCH 31/36] chore(linux): update version of riscv electron --- electron.riscv64.sh | 4 ++-- package_linux_bin.sh | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/electron.riscv64.sh b/electron.riscv64.sh index 1d03679..b9991ce 100755 --- a/electron.riscv64.sh +++ b/electron.riscv64.sh @@ -2,7 +2,7 @@ set -ex -export ELECTRON_VERSION="32.1.2" +export ELECTRON_VERSION="32.2.1" export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}.riscv1" -echo "1893e6e8831ddd9c30111db02ad7edbaad8ebbf43d69054657f7221fb6086819 *electron-v${ELECTRON_VERSION}-linux-riscv64.zip" >> build/checksums/electron.txt +echo "03b1b478ab7b9d40da5c47edef0bbeeb528a8bed5335018ff38e513b7df43c7f *electron-v${ELECTRON_VERSION}-linux-riscv64.zip" >> build/checksums/electron.txt diff --git a/package_linux_bin.sh b/package_linux_bin.sh index 70cc726..3815f16 100755 --- a/package_linux_bin.sh +++ b/package_linux_bin.sh @@ -31,9 +31,8 @@ if [[ "${VSCODE_ARCH}" == "riscv64" ]]; then if [[ "${ELECTRON_VERSION}" != "$(yarn config get target)" ]]; then # Fail the pipeline if electron target doesn't match what is used. - # Look for releases here if electron version used by vscode changed: - # https://github.com/riscv-forks/electron-riscv-releases/releases echo "Electron RISC-V binary version doesn't match target electron version!" + echo "Releases available at: https://github.com/${VSCODE_ELECTRON_REPO}/releases" exit 1 fi fi From b80aa30a35e732a295ac0cc69e472d52c0a8bd7a Mon Sep 17 00:00:00 2001 From: VSCodium CI Date: Tue, 29 Oct 2024 08:54:00 +0000 Subject: [PATCH 32/36] build(insider): update to commit 912bb68 --- insider.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/insider.json b/insider.json index 0dcbcc0..738f0a9 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { "tag": "1.95.0", - "commit": "39fd376a04ae461e1abb4212d6395d7a56959198" + "commit": "912bb683695358a54ae0c670461738984cbb5b95" } From e4e4be70c92429d0d824ddd4057acd79fca4e705 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 29 Oct 2024 11:00:57 +0100 Subject: [PATCH 33/36] docs: update thanks --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bbdd189..1ab1e84 100644 --- a/README.md +++ b/README.md @@ -204,15 +204,15 @@ The minimal version is limited by the core component Electron, you may want to c MacStadium logo for providing a Mac mini M1 - - - SignPath logo - for Windows certificate @daiyam for macOS certificate + + SignPath logo + free code signing on Windows provided by SignPath.io, certificate by SignPath Foundation + ## License From 1125a02e16a60561616d7508f153c7367f909fe9 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 29 Oct 2024 12:19:38 +0100 Subject: [PATCH 34/36] fix: tree-sitter is optional (#2076) --- patches/optional-tree-sitter.patch | 161 +++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 patches/optional-tree-sitter.patch diff --git a/patches/optional-tree-sitter.patch b/patches/optional-tree-sitter.patch new file mode 100644 index 0000000..8287591 --- /dev/null +++ b/patches/optional-tree-sitter.patch @@ -0,0 +1,161 @@ +diff --git a/build/package-lock.json b/build/package-lock.json +index 1e373f2..3ea31d0 100644 +--- a/build/package-lock.json ++++ b/build/package-lock.json +@@ -53,3 +53,2 @@ + "through2": "^4.0.2", +- "tree-sitter": "^0.20.5", + "vscode-universal-bundler": "^0.1.3", +@@ -59,2 +58,3 @@ + "optionalDependencies": { ++ "tree-sitter": "^0.20.5", + "tree-sitter-typescript": "^0.20.5", +@@ -1381,3 +1381,3 @@ + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", +- "devOptional": true, ++ "optional": true, + "dependencies": { +@@ -1433,3 +1433,2 @@ + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", +- "devOptional": true, + "funding": [ +@@ -1448,2 +1447,3 @@ + ], ++ "optional": true, + "dependencies": { +@@ -1622,3 +1622,3 @@ + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", +- "devOptional": true ++ "optional": true + }, +@@ -1830,3 +1830,3 @@ + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", +- "devOptional": true, ++ "optional": true, + "engines": { +@@ -1896,3 +1896,3 @@ + "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", +- "devOptional": true, ++ "optional": true, + "engines": { +@@ -2150,3 +2150,3 @@ + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", +- "devOptional": true, ++ "optional": true, + "engines": { +@@ -2281,3 +2281,3 @@ + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", +- "devOptional": true ++ "optional": true + }, +@@ -2363,3 +2363,3 @@ + "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", +- "devOptional": true ++ "optional": true + }, +@@ -2676,3 +2676,2 @@ + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", +- "devOptional": true, + "funding": [ +@@ -2690,3 +2689,4 @@ + } +- ] ++ ], ++ "optional": true + }, +@@ -2713,3 +2713,3 @@ + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", +- "devOptional": true ++ "optional": true + }, +@@ -3165,3 +3165,3 @@ + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", +- "devOptional": true ++ "optional": true + }, +@@ -3183,3 +3183,3 @@ + "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==", +- "devOptional": true ++ "optional": true + }, +@@ -3189,3 +3189,3 @@ + "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", +- "devOptional": true ++ "optional": true + }, +@@ -3195,3 +3195,3 @@ + "integrity": "sha512-qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw==", +- "devOptional": true, ++ "optional": true, + "dependencies": { +@@ -3207,3 +3207,3 @@ + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", +- "devOptional": true, ++ "optional": true, + "dependencies": { +@@ -3475,3 +3475,3 @@ + "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", +- "devOptional": true, ++ "optional": true, + "dependencies": { +@@ -3559,3 +3559,3 @@ + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", +- "devOptional": true, ++ "optional": true, + "dependencies": { +@@ -3772,3 +3772,2 @@ + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", +- "devOptional": true, + "funding": [ +@@ -3786,3 +3785,4 @@ + } +- ] ++ ], ++ "optional": true + }, +@@ -3792,3 +3792,2 @@ + "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", +- "devOptional": true, + "funding": [ +@@ -3807,2 +3806,3 @@ + ], ++ "optional": true, + "dependencies": { +@@ -3901,3 +3901,3 @@ + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", +- "devOptional": true, ++ "optional": true, + "engines": { +@@ -3934,3 +3934,3 @@ + "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", +- "devOptional": true, ++ "optional": true, + "dependencies": { +@@ -3946,3 +3946,3 @@ + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", +- "devOptional": true, ++ "optional": true, + "dependencies": { +@@ -4029,4 +4029,4 @@ + "integrity": "sha512-GxJodajVpfgb3UREzzIbtA1hyRnTxVbWVXrbC6sk4xTMH5ERMBJk9HJNq4c8jOJeUaIOmLcwg+t6mez/PDvGqg==", +- "devOptional": true, + "hasInstallScript": true, ++ "optional": true, + "dependencies": { +@@ -4066,3 +4066,3 @@ + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", +- "devOptional": true, ++ "optional": true, + "dependencies": { +diff --git a/build/package.json b/build/package.json +index aa94a21..9644be4 100644 +--- a/build/package.json ++++ b/build/package.json +@@ -47,3 +47,2 @@ + "through2": "^4.0.2", +- "tree-sitter": "^0.20.5", + "vscode-universal-bundler": "^0.1.3", +@@ -59,2 +58,3 @@ + "optionalDependencies": { ++ "tree-sitter": "^0.20.5", + "tree-sitter-typescript": "^0.20.5", From 2b8134a202ef1741a569c27b8762cf3086ceef67 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 29 Oct 2024 14:22:26 +0100 Subject: [PATCH 35/36] fix(linux): build ppc64 (#2077) --- package_linux_reh.sh | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/package_linux_reh.sh b/package_linux_reh.sh index 35d48ab..00788b6 100755 --- a/package_linux_reh.sh +++ b/package_linux_reh.sh @@ -39,7 +39,7 @@ if [[ "${VSCODE_ARCH}" == "x64" || "${VSCODE_ARCH}" == "arm64" ]]; then elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-arm32v7" elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then - VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-ppc64le" + VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-ppc64le" export ELECTRON_SKIP_BINARY_DOWNLOAD=1 export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 export VSCODE_SYSROOT_REPO='VSCodium/vscode-linux-build-agent' @@ -72,6 +72,28 @@ if [[ -d "../patches/linux/reh/" ]]; then done fi +if [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then + INCLUDES=$(cat < "$HOME/.gyp/include.gypi" +fi + for i in {1..5}; do # try 5 times npm ci --prefix build && break if [[ $i == 3 ]]; then From 606a83c4c5a45a505c173f93a3319135572b0dcc Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 29 Oct 2024 19:13:00 +0100 Subject: [PATCH 36/36] ci(windows): add flag to disable signing [skip ci] --- .github/workflows/insider-windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index 8d4e824..f32b842 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -108,7 +108,7 @@ jobs: assets/*.exe assets/*.msi retention-days: 1 - if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') + if: env.SHOULD_BUILD == 'yes' && vars.DISABLE_INSIDER_WINDOWS_SIGNING != 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') - name: Signing uses: signpath/github-action-submit-signing-request@v1 @@ -123,7 +123,7 @@ jobs: # 3h to manually approve the request wait-for-completion-timeout-in-seconds: 10800 output-artifact-directory: assets/ - if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') + if: env.SHOULD_BUILD == 'yes' && vars.DISABLE_INSIDER_WINDOWS_SIGNING != 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') - name: Prepare checksums run: ./prepare_checksums.sh