From 599eb2adc91d9a71bba59d00375fb544b0fe96fb Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Wed, 14 Jun 2023 11:48:56 +0200 Subject: [PATCH 1/5] fix(linux): type for ppc64le --- .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 eff164d..d01772b 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -132,7 +132,7 @@ jobs: - vscode_arch: arm64 npm_arch: arm64 image: vscodium/vscodium-linux-build-agent:buster-arm64 - - vscode_arch: pp64le + - vscode_arch: ppc64le npm_arch: ppc64 image: vscodium/vscodium-linux-build-agent:bionic-ppc64le - vscode_arch: armhf From 7710a09830fbada661652e70b954bf5852c8f4b6 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Fri, 16 Jun 2023 18:28:28 +0200 Subject: [PATCH 2/5] fix: disable update on linux --- .github/workflows/insider-linux.yml | 1 + .github/workflows/stable-linux.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index d01772b..034201d 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -117,6 +117,7 @@ jobs: - dependencies runs-on: ubuntu-latest env: + DISABLE_UPDATE: 'yes' MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }} MS_TAG: ${{ needs.check.outputs.MS_TAG }} RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }} diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml index d5881fc..664c4b3 100644 --- a/.github/workflows/stable-linux.yml +++ b/.github/workflows/stable-linux.yml @@ -114,6 +114,7 @@ jobs: - dependencies runs-on: ubuntu-latest env: + DISABLE_UPDATE: 'yes' MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }} MS_TAG: ${{ needs.check.outputs.MS_TAG }} RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }} From d06d8127d54e69695858ac896a14892c26111248 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Fri, 7 Jul 2023 00:10:45 +0200 Subject: [PATCH 3/5] feat: update to 1.80 --- patches/brand.patch | 122 +++++++++++++++++------------------- patches/remove-mangle.patch | 42 +++++-------- patches/win7.patch | 4 +- product.json | 10 ++- 4 files changed, 82 insertions(+), 96 deletions(-) diff --git a/patches/brand.patch b/patches/brand.patch index 1150252..1f35a7e 100644 --- a/patches/brand.patch +++ b/patches/brand.patch @@ -68,37 +68,37 @@ index 459bd9a..925945a 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 2471b5d..078a8f1 100644 +index 74386ba..dae5d9a 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json -@@ -200,3 +200,3 @@ +@@ -201,3 +201,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" -@@ -227,4 +227,4 @@ +@@ -228,4 +228,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.", -@@ -279,3 +279,3 @@ +@@ -280,3 +280,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" -@@ -287,3 +287,3 @@ +@@ -288,3 +288,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" -@@ -295,3 +295,3 @@ +@@ -296,3 +296,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" -@@ -301,6 +301,6 @@ +@@ -302,6 +302,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).", @@ -107,7 +107,7 @@ index 2471b5d..078a8f1 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" -@@ -309,6 +309,6 @@ +@@ -310,6 +310,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).", @@ -116,7 +116,7 @@ index 2471b5d..078a8f1 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" -@@ -317,6 +317,6 @@ +@@ -318,6 +318,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).", @@ -125,7 +125,7 @@ index 2471b5d..078a8f1 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" -@@ -325,6 +325,6 @@ +@@ -326,6 +326,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).", @@ -134,7 +134,7 @@ index 2471b5d..078a8f1 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" -@@ -333,6 +333,6 @@ +@@ -334,6 +334,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).", @@ -143,32 +143,32 @@ index 2471b5d..078a8f1 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,3 +351,3 @@ +@@ -352,3 +352,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" -@@ -360,3 +360,3 @@ +@@ -361,3 +361,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" -@@ -368,3 +368,3 @@ +@@ -369,3 +369,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" -@@ -376,3 +376,3 @@ +@@ -377,3 +377,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" -@@ -384,3 +384,3 @@ +@@ -401,3 +401,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" -@@ -388,3 +388,3 @@ +@@ -405,3 +405,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)." @@ -259,16 +259,16 @@ index 571d047..ca31e06 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 8049ad9..d5524ec 100644 +index e39e597..3202c03 100644 --- a/extensions/markdown-language-features/package.nls.json +++ b/extensions/markdown-language-features/package.nls.json -@@ -20,3 +20,3 @@ +@@ -21,3 +21,3 @@ "markdown.trace.extension.desc": "Enable debug logging for the Markdown extension.", - "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.", diff --git a/extensions/media-preview/package.nls.json b/extensions/media-preview/package.nls.json -index 27fe241..fb9008f 100644 +index c45e1e2..d8408d8 100644 --- a/extensions/media-preview/package.nls.json +++ b/extensions/media-preview/package.nls.json @@ -2,3 +2,3 @@ @@ -286,10 +286,10 @@ index e21a418..dc0698b 100644 + ${vscode.l10n.t("Open file using VSCodium's standard text/binary editor?")} diff --git a/extensions/media-preview/src/videoPreview.ts b/extensions/media-preview/src/videoPreview.ts -index 5897792..b7f1f02 100644 +index efc6be7..e2a186d 100644 --- a/extensions/media-preview/src/videoPreview.ts +++ b/extensions/media-preview/src/videoPreview.ts -@@ -83,3 +83,3 @@ class VideoPreview extends MediaPreview { +@@ -86,3 +86,3 @@ class VideoPreview extends MediaPreview {

${vscode.l10n.t("An error occurred while loading the video file.")}

- ${vscode.l10n.t("Open file using VS Code's standard text/binary editor?")} + ${vscode.l10n.t("Open file using VSCodium's standard text/binary editor?")} @@ -322,25 +322,25 @@ index f63b127..799111f 100644 + "comment": "The simpler (?<=\\bProcess\\.|\\bCommandLine\\.) breaks VSCodium / Atom, see https://github.com/textmate/swift.tmbundle/issues/29", "match": "(?<=^Process\\.|\\WProcess\\.|^CommandLine\\.|\\WCommandLine\\.)(arguments|argc|unsafeArgv)", diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json -index 22d62c8..6fd8604 100644 +index bd4dd63..058204c 100644 --- a/extensions/typescript-language-features/package.nls.json +++ b/extensions/typescript-language-features/package.nls.json -@@ -73,3 +73,3 @@ +@@ -74,3 +74,3 @@ "configuration.tsserver.experimental.enableProjectDiagnostics": "(Experimental) 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": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use VSCodium's locale.", "configuration.implicitProjectConfig.module": "Sets the module system for the program. See more: https://www.typescriptlang.org/tsconfig#module.", -@@ -154,3 +154,3 @@ +@@ -155,3 +155,3 @@ "typescript.preferences.autoImportFileExcludePatterns": "Specify glob patterns of files to exclude from auto imports. Requires using TypeScript 4.8 or newer 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.", -@@ -160,3 +160,3 @@ +@@ -161,3 +161,3 @@ "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.", -@@ -212,3 +212,3 @@ +@@ -213,3 +213,3 @@ "configuration.suggest.objectLiteralMethodSnippets.enabled": "Enable/disable snippet completions for methods in object literals. Requires using TypeScript 4.7+ in the workspace.", - "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.", @@ -383,7 +383,7 @@ index 984356f..72cc766 100644 + 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 c076600..5528c57 100644 +index b230a1a..9d61f5d 100644 --- a/extensions/vscode-api-tests/package.json +++ b/extensions/vscode-api-tests/package.json @@ -2,3 +2,3 @@ @@ -418,7 +418,7 @@ index befc3ca..caf98f5 100644 + "c": "broken highlighting in VSCodium", "t": "source.css.less string.quoted.double.css", diff --git a/extensions/vscode-test-resolver/package.json b/extensions/vscode-test-resolver/package.json -index d54d12a..34dded9 100644 +index e721c65..eba42c6 100644 --- a/extensions/vscode-test-resolver/package.json +++ b/extensions/vscode-test-resolver/package.json @@ -2,3 +2,3 @@ @@ -461,10 +461,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 0951095..05ca0a2 100644 +index b907a06..7bfe096 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts -@@ -508,3 +508,3 @@ export class CodeApplication extends Disposable { +@@ -510,3 +510,3 @@ export class CodeApplication extends Disposable { async startup(): Promise { - this.logService.debug('Starting VS Code'); + this.logService.debug('Starting VSCodium'); @@ -479,25 +479,20 @@ index 296245b..cf03674 100644 +export const ProductQualityContext = new RawContextKey('productQualityType', '', localize('productQualityType', "Quality type of VSCodium")); diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts -index 840f47e..3b35ddc 100644 +index c0a62f8..9c41634 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts -@@ -151,3 +151,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi - if (manifest.engines && manifest.engines.vscode && !isEngineValid(manifest.engines.vscode, this.productService.version, this.productService.date)) { -- throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with VS Code '{1}'.", getGalleryExtensionId(manifest.publisher, manifest.name), this.productService.version)); -+ throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with VSCodium '{1}'.", getGalleryExtensionId(manifest.publisher, manifest.name), this.productService.version)); - } -@@ -213,3 +213,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi +@@ -221,3 +221,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi } catch (e) { - throw new Error(nls.localize('removeError', "Error while removing the extension: {0}. Please Quit and Start VS Code before trying again.", toErrorMessage(e))); + throw new Error(nls.localize('removeError', "Error while removing the extension: {0}. Please Quit and Start VSCodium before trying again.", toErrorMessage(e))); } -@@ -921,3 +921,3 @@ class InstallVSIXTask extends InstallExtensionTask { +@@ -936,3 +936,3 @@ class InstallVSIXTask extends InstallExtensionTask { } catch (e) { - 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)); } -@@ -934,3 +934,3 @@ class InstallVSIXTask extends InstallExtensionTask { +@@ -949,3 +949,3 @@ class InstallVSIXTask extends InstallExtensionTask { } catch (e) { - 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)); @@ -512,10 +507,10 @@ index 9b0b2ba..6467756 100644 +const TERMINAL_TITLE = nls.localize('console.title', "VSCodium Console"); diff --git a/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts b/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts -index 0978c3a..ea54458 100644 +index 01ab403..3f167c6 100644 --- a/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts +++ b/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts -@@ -438,3 +438,3 @@ const terminalPlatformConfiguration: IConfigurationNode = { +@@ -338,3 +338,3 @@ const terminalPlatformConfiguration: IConfigurationNode = { scope: ConfigurationScope.APPLICATION, - description: localize('terminal.integrated.inheritEnv', "Whether new shells should inherit their environment from VS Code, which may source a login shell to ensure $PATH and other development variables are initialized. This has no effect on Windows."), + description: localize('terminal.integrated.inheritEnv', "Whether new shells should inherit their environment from VSCodium, which may source a login shell to ensure $PATH and other development variables are initialized. This has no effect on Windows."), @@ -550,7 +545,7 @@ index 3a38daa..3f2cc88 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 138f6dd..ebb720f 100644 +index 6163df6..a3f3b82 100644 --- a/src/vs/server/node/server.cli.ts +++ b/src/vs/server/node/server.cli.ts @@ -422,3 +422,3 @@ function asExtensionIdOrVSIX(inputs: string[] | undefined) { @@ -586,10 +581,10 @@ index c2053ac..7995087 100644 + static readonly TestItem = new ApiCommandArgument('testItem', 'A VSCodium TestItem', v => v instanceof TestItemImpl, extHostTypeConverter.TestItem.from); diff --git a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts -index 0252b10..6d81208 100644 +index d13779a..246889f 100644 --- a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts +++ b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts -@@ -353,3 +353,3 @@ suite('NotebookCell#Document', function () { +@@ -357,3 +357,3 @@ suite('NotebookCell#Document', function () { - test('Opening a notebook results in VS Code firing the event onDidChangeActiveNotebookEditor twice #118470', function () { + test('Opening a notebook results in VSCodium firing the event onDidChangeActiveNotebookEditor twice #118470', function () { @@ -604,10 +599,10 @@ index 7d464e0..4d12d65 100644 + localize('screenReaderDetectedExplanation.question', "Are you using a screen reader to operate VSCodium?"), [{ diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts -index c79b3a9..9be227e 100644 +index e0c1272..84f9d08 100644 --- a/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts -@@ -520,3 +520,3 @@ const registry = Registry.as(ConfigurationExtensions.Con +@@ -534,3 +534,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."), @@ -660,7 +655,7 @@ index fbf7362..c4dc351 100644 + const message = requireReload ? localize('InstallVSIXAction.successReload', "Completed installing {0} extension from VSIX. Please reload VSCodium to enable it.", extension.displayName || extension.name) : localize('InstallVSIXAction.success', "Completed installing {0} extension from VSIX.", extension.displayName || extension.name); diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts -index f996bfa..1a96837 100644 +index 9f651b6..c9be538 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts @@ -104,3 +104,3 @@ export class PromptExtensionInstallFailureAction extends Action { @@ -668,32 +663,27 @@ index f996bfa..1a96837 100644 - const productName = isWeb ? localize('VS Code for Web', "{0} for the Web", this.productService.nameLong) : this.productService.nameLong; + const productName = isWeb ? localize('VSCodium for Web', "{0} for the Web", this.productService.nameLong) : this.productService.nameLong; const message = localize('cannot be installed', "The '{0}' extension is not available in {1}. Click 'More Information' to learn more.", this.extension.displayName || this.extension.identifier.id, productName); -@@ -380,3 +380,3 @@ export abstract class AbstractInstallAction extends ExtensionAction { +@@ -382,3 +382,3 @@ export class InstallAction extends ExtensionAction { } else if (this.extension.deprecationInfo.settings) { - detail = localize('deprecated with alternate settings message', "This extension is deprecated as this functionality is now built-in to VS Code."); + detail = localize('deprecated with alternate settings message', "This extension is deprecated as this functionality is now built-in to VSCodium."); -@@ -600,3 +600,3 @@ export class InstallAndSyncAction extends AbstractInstallAction { - extensionsWorkbenchService, instantiationService, runtimeExtensionService, workbenchThemeService, labelService, dialogService, preferencesService, telemetryService); -- this.tooltip = localize({ key: 'install everywhere tooltip', comment: ['Placeholder is the name of the product. Eg: Visual Studio Code or Visual Studio Code - Insiders'] }, "Install this extension in all your synced {0} instances", productService.nameLong); -+ this.tooltip = localize({ key: 'install everywhere tooltip', comment: ['Placeholder is the name of the product. Eg: VSCodium or VSCodium - Insiders'] }, "Install this extension in all your synced {0} instances", productService.nameLong); - this._register(Event.any(userDataSyncEnablementService.onDidChangeEnablement, -@@ -873,3 +873,3 @@ export class UninstallAction extends ExtensionAction { +@@ -765,3 +765,3 @@ export class UninstallAction extends ExtensionAction { return this.extensionsWorkbenchService.uninstall(this.extension).then(() => { - alert(localize('uninstallExtensionComplete', "Please reload Visual Studio Code to complete the uninstallation of the extension {0}.", this.extension!.displayName)); + alert(localize('uninstallExtensionComplete', "Please reload VSCodium to complete the uninstallation of the extension {0}.", this.extension!.displayName)); }); -@@ -2339,3 +2339,3 @@ export class ExtensionStatusAction extends ExtensionAction { +@@ -2231,3 +2231,3 @@ export class ExtensionStatusAction extends ExtensionAction { const link = `[${localize('settings', "settings")}](${URI.parse(`command:workbench.action.openSettings?${encodeURIComponent(JSON.stringify([this.extension.deprecationInfo.settings.map(setting => `@id:${setting}`).join(' ')]))}`)})`; - this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to VS Code. Configure these {0} to use this functionality.", link)) }, true); + this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to VSCodium. Configure these {0} to use this functionality.", link)) }, true); } else { -@@ -2363,3 +2363,3 @@ export class ExtensionStatusAction extends ExtensionAction { +@@ -2255,3 +2255,3 @@ export class ExtensionStatusAction extends ExtensionAction { if (this.extensionManagementServerService.webExtensionManagementServer) { - 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); const message = new MarkdownString(`${localize('not web tooltip', "The '{0}' extension is not available in {1}.", this.extension.displayName || this.extension.identifier.id, productName)} [${localize('learn why', "Learn Why")}](https://aka.ms/vscode-web-extensions-guide)`); -@@ -2625,3 +2625,3 @@ export class ReinstallAction extends Action { +@@ -2517,3 +2517,3 @@ export class ReinstallAction extends Action { const requireReload = !(extension.local && this.extensionService.canAddExtension(toExtensionDescription(extension.local))); - const message = requireReload ? localize('ReinstallAction.successReload', "Please reload Visual Studio Code to complete reinstalling the extension {0}.", extension.identifier.id) + const message = requireReload ? localize('ReinstallAction.successReload', "Please reload VSCodium to complete reinstalling the extension {0}.", extension.identifier.id) @@ -831,10 +821,10 @@ index 386247a..e791a51 100644 + 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 6a40c19..9f91ef1 100644 +index 9fc3493..cee8724 100644 --- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts +++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts -@@ -3088,3 +3088,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer +@@ -3093,3 +3093,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.')); @@ -872,7 +862,7 @@ index 34fb9cc..965008e 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 73a3442..22e36f6 100644 +index c780642..ec47c94 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts @@ -159,3 +159,3 @@ export class TerminalViewPane extends ViewPane { @@ -925,10 +915,10 @@ index c13d93e..206e46a 100644 + content += `// By default, VSCodium trusts "localhost".\n`; } diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts -index 8c2aa42..2902007 100644 +index 074ecfe..e5b495d 100644 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts -@@ -306,3 +306,3 @@ configurationRegistry.registerConfiguration({ +@@ -309,3 +309,3 @@ configurationRegistry.registerConfiguration({ localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.none' }, "Start without an editor."), - localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePage' }, "Open the Welcome page, with content to aid in getting started with VS Code and extensions."), + localize({ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'workbench.startupEditor.welcomePage' }, "Open the Welcome page, with content to aid in getting started with VSCodium and extensions."), @@ -981,10 +971,10 @@ index 6d70549..c78c2db 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/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts -index b29c51d..84f69c8 100644 +index 218befa..492b7b1 100644 --- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts +++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts -@@ -459,3 +459,3 @@ export class ExtensionManagementService extends Disposable implements IWorkbench +@@ -492,3 +492,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); @@ -1066,7 +1056,7 @@ index 0f604a3..e4da080 100644 + label: nls.localize('relaunch', "Relaunch VSCodium"), run: () => { diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts -index fad2c8d..2372e16 100644 +index 75d7d57..05dea0a 100644 --- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts +++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts @@ -134,3 +134,3 @@ export class UserDataProfileManagementService extends Disposable implements IUse diff --git a/patches/remove-mangle.patch b/patches/remove-mangle.patch index aa9490e..f629c2b 100644 --- a/patches/remove-mangle.patch +++ b/patches/remove-mangle.patch @@ -1,30 +1,26 @@ diff --git a/build/lib/compilation.js b/build/lib/compilation.js -index 63ddeb2..31d2f35 100644 +index 2270e05..1bd7b90 100644 --- a/build/lib/compilation.js +++ b/build/lib/compilation.js -@@ -21,3 +21,2 @@ const File = require("vinyl"); - const task = require("./task"); --const mangleTypeScript_1 = require("./mangleTypeScript"); - const watch = require('./watch'); -@@ -104,24 +103,3 @@ function compileTask(src, out, build, options = {}) { +@@ -104,24 +104,3 @@ function compileTask(src, out, build, options = {}) { } - // mangle: TypeScript to TypeScript - let mangleStream = es.through(); - if (build && !options.disableMangle) { -- let ts2tsMangler = new mangleTypeScript_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data)); +- let ts2tsMangler = new index_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true }); - const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState'])); -- mangleStream = es.through(function write(data) { +- mangleStream = es.through(async function write(data) { - const tsNormalPath = ts.normalizePath(data.path); -- const newContents = newContentsByFileName.get(tsNormalPath); +- const newContents = (await newContentsByFileName).get(tsNormalPath); - if (newContents !== undefined) { - data.contents = Buffer.from(newContents.out); - data.sourceMap = newContents.sourceMap && JSON.parse(newContents.sourceMap); - } - this.push(data); -- }, function end() { -- this.push(null); +- }, async function end() { - // free resources -- newContentsByFileName.clear(); +- (await newContentsByFileName).clear(); +- this.push(null); - ts2tsMangler = undefined; - }); - } @@ -32,34 +28,30 @@ index 63ddeb2..31d2f35 100644 - .pipe(mangleStream) .pipe(generator.stream) diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts -index d5cd196..afe16d3 100644 +index d5da3f1..fa46962 100644 --- a/build/lib/compilation.ts +++ b/build/lib/compilation.ts -@@ -19,4 +19,2 @@ import * as File from 'vinyl'; - import * as task from './task'; --import { Mangler } from './mangleTypeScript'; --import { RawSourceMap } from 'source-map'; - const watch = require('./watch'); -@@ -123,26 +121,3 @@ export function compileTask(src: string, out: string, build: boolean, options: { +@@ -123,27 +123,3 @@ export function compileTask(src: string, out: string, build: boolean, options: { - // mangle: TypeScript to TypeScript - let mangleStream = es.through(); - if (build && !options.disableMangle) { -- let ts2tsMangler = new Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data)); +- let ts2tsMangler = new Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true }); - const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState'])); -- mangleStream = es.through(function write(data: File & { sourceMap?: RawSourceMap }) { +- mangleStream = es.through(async function write(data: File & { sourceMap?: RawSourceMap }) { - type TypeScriptExt = typeof ts & { normalizePath(path: string): string }; - const tsNormalPath = (ts).normalizePath(data.path); -- const newContents = newContentsByFileName.get(tsNormalPath); +- const newContents = (await newContentsByFileName).get(tsNormalPath); - if (newContents !== undefined) { - data.contents = Buffer.from(newContents.out); - data.sourceMap = newContents.sourceMap && JSON.parse(newContents.sourceMap); - } - this.push(data); -- }, function end() { -- this.push(null); +- }, async function end() { - // free resources -- newContentsByFileName.clear(); +- (await newContentsByFileName).clear(); +- +- this.push(null); - (ts2tsMangler) = undefined; - }); - } diff --git a/patches/win7.patch b/patches/win7.patch index c2d1212..22dce4a 100644 --- a/patches/win7.patch +++ b/patches/win7.patch @@ -1,9 +1,9 @@ diff --git a/build/win32/code.iss b/build/win32/code.iss -index d365ab1..1a02701 100644 +index 44c9f2f..454aa09 100644 --- a/build/win32/code.iss +++ b/build/win32/code.iss @@ -28,3 +28,3 @@ ChangesEnvironment=true ChangesAssociations=true --MinVersion=6.2 +-MinVersion=10.0 +MinVersion=6.1.7600 SourceDir={#SourceDir} diff --git a/product.json b/product.json index 9e930f3..9690f16 100644 --- a/product.json +++ b/product.json @@ -121,10 +121,10 @@ "fileSearchProvider", "quickPickSortByLabel", "workspaceTrust", + "shareProvider", "scmActionButton", "scmSelectedProvider", "scmValidation", - "shareProvider", "textSearchProvider", "timeline" ], @@ -174,12 +174,13 @@ "contribShareMenu", "fileComments", "contribCommentPeekContext", - "treeItemCheckbox", "codiconDecoration", "diffCommand", "contribCommentEditorActionsMenu", + "readonlyMessage", "shareProvider", - "quickDiffProvider" + "quickDiffProvider", + "quickPickItemIcon" ], "GitHub.copilot": [ "inlineCompletionsAdditions" @@ -241,6 +242,9 @@ "ms-azuretools.vscode-azureappservice": [ "terminalDataWriteEvent" ], + "ms-azuretools.vscode-azureresourcegroups": [ + "authGetSessions" + ], "ms-vscode.anycode": [ "extensionsAny" ], From 3fa7f2179b19d50ffb46809702814f8463ce9ce6 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Fri, 7 Jul 2023 00:23:35 +0200 Subject: [PATCH 4/5] feat: used latest nodejs 16 --- .github/workflows/insider-linux.yml | 4 ++-- .github/workflows/insider-macos.yml | 2 +- .github/workflows/insider-spearhead.yml | 2 +- .github/workflows/insider-windows.yml | 2 +- .github/workflows/stable-linux.yml | 4 ++-- .github/workflows/stable-macos.yml | 2 +- .github/workflows/stable-windows.yml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index 034201d..119755a 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -87,7 +87,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v3 with: - node-version: '16.17' + node-version: '16' - name: Install Yarn run: npm install -g yarn @@ -163,7 +163,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v3 with: - node-version: '16.17' + node-version: '16' - name: Install Yarn run: npm install -g yarn diff --git a/.github/workflows/insider-macos.yml b/.github/workflows/insider-macos.yml index faefbcc..450b8bc 100644 --- a/.github/workflows/insider-macos.yml +++ b/.github/workflows/insider-macos.yml @@ -50,7 +50,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v3 with: - node-version: '16.17' + node-version: '16' - name: Clone VSCode repo env: diff --git a/.github/workflows/insider-spearhead.yml b/.github/workflows/insider-spearhead.yml index e6923b8..dc67519 100644 --- a/.github/workflows/insider-spearhead.yml +++ b/.github/workflows/insider-spearhead.yml @@ -25,7 +25,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v3 with: - node-version: '16.17' + node-version: '16' - name: Clone VSCode repo run: . get_repo.sh diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index c854755..509ff47 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -55,7 +55,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v3 with: - node-version: '16.17' + node-version: '16' - name: Install Yarn run: npm install -g yarn diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml index 664c4b3..d3592f4 100644 --- a/.github/workflows/stable-linux.yml +++ b/.github/workflows/stable-linux.yml @@ -84,7 +84,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v3 with: - node-version: '16.17' + node-version: '16' - name: Install Yarn run: npm install -g yarn @@ -158,7 +158,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v3 with: - node-version: '16.17' + node-version: '16' - name: Install Yarn run: npm install -g yarn diff --git a/.github/workflows/stable-macos.yml b/.github/workflows/stable-macos.yml index dd2e4c3..0daf06c 100644 --- a/.github/workflows/stable-macos.yml +++ b/.github/workflows/stable-macos.yml @@ -47,7 +47,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v3 with: - node-version: '16.17' + node-version: '16' - name: Clone VSCode repo run: . get_repo.sh diff --git a/.github/workflows/stable-windows.yml b/.github/workflows/stable-windows.yml index 718ecef..e4d27d9 100644 --- a/.github/workflows/stable-windows.yml +++ b/.github/workflows/stable-windows.yml @@ -53,7 +53,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v3 with: - node-version: '16.17' + node-version: '16' - name: Install Yarn run: npm install -g yarn From d6b7880a054ea22dac2f0d6eaa168a714f37c309 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 18 Jul 2023 21:57:50 +0200 Subject: [PATCH 5/5] fix: use blank commit id --- get_repo.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/get_repo.sh b/get_repo.sh index 4f59cd1..6106f0d 100755 --- a/get_repo.sh +++ b/get_repo.sh @@ -10,13 +10,13 @@ fi if [[ -z "${RELEASE_VERSION}" ]]; then if [[ "${VSCODE_QUALITY}" == "insider" ]]; then if [[ "${VSCODE_LATEST}" == "yes" ]] || [[ ! -f "insider.json" ]]; then - UPDATE_INFO=$( curl --silent https://update.code.visualstudio.com/api/update/darwin/insider/lol ) + UPDATE_INFO=$( curl --silent --fail https://update.code.visualstudio.com/api/update/darwin/insider/0000000000000000000000000000000000000000 ) else export MS_COMMIT=$(jq -r '.commit' insider.json) export MS_TAG=$(jq -r '.tag' insider.json) fi else - UPDATE_INFO=$( curl --silent https://update.code.visualstudio.com/api/update/darwin/stable/lol ) + UPDATE_INFO=$( curl --silent --fail https://update.code.visualstudio.com/api/update/darwin/stable/0000000000000000000000000000000000000000 ) fi if [[ -z "${MS_COMMIT}" ]]; then @@ -41,14 +41,14 @@ else then MS_TAG="${BASH_REMATCH[1]}" else - echo "Bad RELEASE_VERSION: ${RELEASE_VERSION}" + echo "Error: Bad RELEASE_VERSION: ${RELEASE_VERSION}" exit 1 fi if [[ "${MS_TAG}" == "$(jq -r '.tag' insider.json)" ]]; then export MS_COMMIT=$(jq -r '.commit' insider.json) else - echo "No MS_COMMIT for ${RELEASE_VERSION}" + echo "Error: No MS_COMMIT for ${RELEASE_VERSION}" exit 1 fi else @@ -56,7 +56,7 @@ else then MS_TAG="${BASH_REMATCH[1]}" else - echo "Bad RELEASE_VERSION: ${RELEASE_VERSION}" + echo "Error: Bad RELEASE_VERSION: ${RELEASE_VERSION}" exit 1 fi fi @@ -73,9 +73,9 @@ git remote add origin https://github.com/Microsoft/vscode.git # figure out latest tag by calling MS update API if [[ -z "${MS_TAG}" ]]; then if [[ "${VSCODE_QUALITY}" == "insider" ]]; then - UPDATE_INFO=$( curl --silent https://update.code.visualstudio.com/api/update/darwin/insider/lol ) + UPDATE_INFO=$( curl --silent --fail https://update.code.visualstudio.com/api/update/darwin/insider/0000000000000000000000000000000000000000 ) else - UPDATE_INFO=$( curl --silent https://update.code.visualstudio.com/api/update/darwin/stable/lol ) + UPDATE_INFO=$( curl --silent --fail https://update.code.visualstudio.com/api/update/darwin/stable/0000000000000000000000000000000000000000 ) fi export MS_COMMIT=$( echo "${UPDATE_INFO}" | jq -r '.version' ) export MS_TAG=$( echo "${UPDATE_INFO}" | jq -r '.name' ) @@ -83,13 +83,13 @@ elif [[ -z "${MS_COMMIT}" ]]; then REFERENCE=$( git ls-remote --tags | grep -x ".*refs\/tags\/${MS_TAG}" | head -1 ) if [[ -z "${REFERENCE}" ]]; then - echo "The following tag can't be found: ${MS_TAG}" + echo "Error: The following tag can't be found: ${MS_TAG}" exit 1 elif [[ "${REFERENCE}" =~ ^([[:alnum:]]+)[[:space:]]+refs\/tags\/([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then export MS_COMMIT="${BASH_REMATCH[1]}" export MS_TAG="${BASH_REMATCH[2]}" else - echo "The following reference can't be parsed: ${REFERENCE}" + echo "Error: The following reference can't be parsed: ${REFERENCE}" exit 1 fi fi