diff --git a/RELEASE.md b/RELEASE.md index 8952846..1a34b15 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -15,18 +15,25 @@ We use major.minor branches (e.g., `1.0`, `1.1`, `2.1`) for releases. ### Release Process -1. **Determine version**: Choose tag name based on the commit's branch +1. **Determine Code Editor Version**: Choose tag name based on the commit's branch - Tag format: `major.minor.patch` matching the branch the commit belongs to - Example: Commit on `1.0` branch → tag `1.0.0`, `1.0.1`, etc. + - Pre-release candidates have a tag suffix as `rc.{release_candidate_version}`. For example `1.0.4-rc.1` or `1.0.4-rc.2`. -2. **Create tag**: Choose one of these methods: +2. **Determine SageMaker Code Editor Version**: + - Get in touch with the SageMaker team to decide what SageMaker version needs to be used for the latest release. + - Hard-code that version in the patch `patches/sagemaker/display-both-versions-in-about.diff` in `product.json`. + + +3. **Create release**: - **Command line**: Push tag to trigger release workflow ```bash git tag 1.0.0 git push origin 1.0.0 ``` - - **GitHub Actions**: Manually run "Create release" workflow from Actions tab - - **GitHub UI**: Go to Releases → Create a new release - -3. **Release notes**: Include code-oss version information in the release description + - The workflow will: + - Fetch build artifacts for that commit + - Inject Code Editor version from the release tag into product.json + - Create GitHub release +4. **Release notes**: Include code-oss version and Sagemaker Code Editor Version information in the release description. Release description can be edited once the release workflow creates the release. \ No newline at end of file diff --git a/patches/sagemaker.series b/patches/sagemaker.series index e55003b..55dd5e0 100644 --- a/patches/sagemaker.series +++ b/patches/sagemaker.series @@ -41,4 +41,5 @@ sagemaker/sagemaker-extension-smus-support.diff sagemaker/post-startup-notifications.diff sagemaker/sagemaker-extensions-sync.diff sagemaker/fix-port-forwarding.diff +sagemaker/display-both-versions-in-about.diff sagemaker/validate-http-request-referer.diff diff --git a/patches/sagemaker/display-both-versions-in-about.diff b/patches/sagemaker/display-both-versions-in-about.diff new file mode 100644 index 0000000..efa13d3 --- /dev/null +++ b/patches/sagemaker/display-both-versions-in-about.diff @@ -0,0 +1,39 @@ +Index: code-editor-src/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts +=================================================================== +--- code-editor-src.orig/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts ++++ code-editor-src/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts +@@ -79,8 +79,8 @@ export class BrowserDialogHandler extend + async about(): Promise { + const detailString = (useAgo: boolean): string => { + return localize('aboutDetail', +- "Code Editor Version: {0}\nCode - OSS Version: {1}\nDate: {2}\nBrowser: {3}", +- this.productService.codeEditorVersion || 'Unknown', ++ "SageMaker Code Editor Version: {0}\nCode - OSS Version: {1}\nDate: {2}\nBrowser: {3}", ++ this.productService.sagemakerCodeEditorVersion || 'Unknown', + this.productService.version || 'Unknown', + this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(new Date(this.productService.date), true) + ')' : ''}` : 'Unknown', + navigator.userAgent +Index: code-editor-src/src/vs/base/common/product.ts +=================================================================== +--- code-editor-src.orig/src/vs/base/common/product.ts ++++ code-editor-src/src/vs/base/common/product.ts +@@ -62,6 +62,7 @@ export interface IProductConfiguration { + readonly quality?: string; + readonly commit?: string; + readonly codeEditorVersion?: string; ++ readonly sagemakerCodeEditorVersion?: string; + + readonly nameShort: string; + readonly nameLong: string; +Index: code-editor-src/product.json +=================================================================== +--- code-editor-src.orig/product.json ++++ code-editor-src/product.json +@@ -12,6 +12,7 @@ + "nameShort": "SageMaker Code Editor", + "nameLong": "SageMaker Code Editor", + "codeEditorVersion": "1.0.0", ++ "sagemakerCodeEditorVersion":"1.0.0", + "applicationName": "code", + "dataFolderName": ".vscode-editor", + "win32MutexName": "vscodeoss", \ No newline at end of file