From 2dc6fcdbc23a29c6262b26cf4876eb51cb59f5c5 Mon Sep 17 00:00:00 2001 From: Rhys Date: Tue, 27 Jul 2021 08:37:56 -0700 Subject: [PATCH] fix(ci): make published readme reference main branch instead of master VSCODE-281 (#331) --- .github/workflows/publish-release.yaml | 2 +- CHANGELOG.md | 135 ++++++++++++------------- README.md | 2 +- src/explorer/helpTree.ts | 2 +- src/telemetry/telemetryService.ts | 2 +- 5 files changed, 71 insertions(+), 72 deletions(-) diff --git a/.github/workflows/publish-release.yaml b/.github/workflows/publish-release.yaml index a65edead5..00f07c806 100644 --- a/.github/workflows/publish-release.yaml +++ b/.github/workflows/publish-release.yaml @@ -39,6 +39,6 @@ jobs: - name: Publish to marketplace run: | echo "Publishing ${VSIX_PATH} to marketplace" - npx vsce publish --packagePath "${VSIX_PATH}" -p ${VSCE_PAT} + npx vsce publish --packagePath "${VSIX_PATH}" --githubBranch main env: VSCE_PAT: ${{ secrets.VSCE_PAT }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 283c7fcc7..9f4da468d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ -# Change Log - -## [v0.6.8](https://github.com/mongodb-js/vscode/releases/tag/v0.6.8) - 2021-07-27 - +# Change Log + +## [v0.6.8](https://github.com/mongodb-js/vscode/releases/tag/v0.6.8) - 2021-07-27 + ### Added - Added support for showing databases a user has permissions to when they cannot `listDatabases` (VSCODE-157, #317) @@ -9,11 +9,11 @@ ### Changed - Updated code lenses in playgrounds to now appear at the end of a selection for partially running (#324) -- Update our CI release pipeline - this is the first automated release ✨ - - -## [v0.6.0](https://github.com/mongodb-js/vscode/releases/tag/v0.6.0) - 2021-07-13 - +- Update our CI release pipeline - this is the first automated release ✨ + + +## [v0.6.0](https://github.com/mongodb-js/vscode/releases/tag/v0.6.0) - 2021-07-13 + ### Added - Added icons for time-series collections (VSCODE-263, #296) @@ -31,11 +31,11 @@ ### Fixed - Fixed showing an error when large files are shown in vscode which have tokenization disabled (VSCODE-250, #290) -- Fixed showing recently dropped collections and databases in the explorer (VSCODE-244, #288) - - -## [v0.5.0](https://github.com/mongodb-js/vscode/releases/tag/v0.5.0) - 2021-03-10 - +- Fixed showing recently dropped collections and databases in the explorer (VSCODE-244, #288) + + +## [v0.5.0](https://github.com/mongodb-js/vscode/releases/tag/v0.5.0) - 2021-03-10 + ### Added - Add documentation details to playground auto completion items (#267) @@ -43,21 +43,21 @@ ### Fixed - Fix launching mongodb shell with ssl in bash (VSCODE-227, #270) - - -## [v0.4.2](https://github.com/mongodb-js/vscode/releases/tag/v0.4.2) - 2021-02-17 - + + +## [v0.4.2](https://github.com/mongodb-js/vscode/releases/tag/v0.4.2) - 2021-02-17 + ### Added - Add icon to refresh collection documents list (#264) ### Changed -- Updated the Atlas link to have https (#259) - - -## [v0.4.1](https://github.com/mongodb-js/vscode/releases/tag/v0.4.1) - 2021-02-10 - +- Updated the Atlas link to have https (#259) + + +## [v0.4.1](https://github.com/mongodb-js/vscode/releases/tag/v0.4.1) - 2021-02-10 + ### Changed - Updated the Atlas link in the overview page (#250) @@ -66,10 +66,10 @@ - Fixed an issue with playground connectivity not defaulting the `directConnection` option to true (VSCODE-234, #255) - Fixed an issue around showing an error while editing a playground file without an active MongoDB connection (VSCODE-231, #251) - - -## [v0.4.0](https://github.com/mongodb-js/vscode/releases/tag/v0.4.0) - 2021-01-25 - + + +## [v0.4.0](https://github.com/mongodb-js/vscode/releases/tag/v0.4.0) - 2021-01-25 + ### Added - Added the ability to edit documents opened from the explorer panel (VSCODE-219, #226, #239) @@ -87,11 +87,11 @@ - Fix opening documents with a binary `_id` from the explorer panel (VSCODE-118, #220) - Fixed playground log output panel to not display when a playground is open and when a playground is run and there was no log output (#234) -- Fixed code lenses for partial playground executions sometimes being missing (VSCODE-226, #243) - - -## [v0.3.0](https://github.com/mongodb-js/vscode/releases/tag/v0.3.0) - 2020-11-24 - +- Fixed code lenses for partial playground executions sometimes being missing (VSCODE-226, #243) + + +## [v0.3.0](https://github.com/mongodb-js/vscode/releases/tag/v0.3.0) - 2020-11-24 + ### Added - Added a resources panel to the overview page (VSCODE-168, #208) @@ -117,19 +117,19 @@ - Removed custom font in overview page (#192) - Removed sql pipeline stage operator (#211) - - -## [v0.2.1](https://github.com/mongodb-js/vscode/releases/tag/0.2.1) - 2020-10-20 - + + +## [v0.2.1](https://github.com/mongodb-js/vscode/releases/tag/0.2.1) - 2020-10-20 + ### Added - Added the ability to use print() and console.log() in playgrounds [#184](https://github.com/mongodb-js/vscode/pull/184) - Added an overview page (more to come on this in future versions) [#178](https://github.com/mongodb-js/vscode/pull/178) -- Added a tooltip to fields in a collection's schema to show types found in the sampling for that field [#179](https://github.com/mongodb-js/vscode/pull/179) - - -## [v0.2.0](https://github.com/mongodb-js/vscode/releases/tag/v0.2.0) - 2020-10-01 - +- Added a tooltip to fields in a collection's schema to show types found in the sampling for that field [#179](https://github.com/mongodb-js/vscode/pull/179) + + +## [v0.2.0](https://github.com/mongodb-js/vscode/releases/tag/v0.2.0) - 2020-10-01 + ### Added - Added a Playgrounds panel that displays `.mongodb` playground files in the current VSCode workspace - Added a setting to configure which folders and files are excluded from the playgrounds panel file searching @@ -138,11 +138,11 @@ ### Changed - Updated our mongosh dependency to 0.4.2 to bring more functionality to playgrounds ### Fixed -- Fixed indexes expanded state caching in the connection explorer panel tree view - - -## [v0.1.1](https://github.com/mongodb-js/vscode/releases/tag/v0.1.1) - 2020-08-10 - +- Fixed indexes expanded state caching in the connection explorer panel tree view + + +## [v0.1.1](https://github.com/mongodb-js/vscode/releases/tag/v0.1.1) - 2020-08-10 + ### Added - Added a search for documents playground shortcut in the tree explorer view @@ -153,11 +153,11 @@ ### Changed - Allow connecting to a new connection while already connecting to another connection -- Allow removing a new connection while it is connecting - - -## [v0.1.0](https://github.com/mongodb-js/vscode/releases/tag/v0.1.0) - 2020-07-16 - +- Allow removing a new connection while it is connecting + + +## [v0.1.0](https://github.com/mongodb-js/vscode/releases/tag/v0.1.0) - 2020-07-16 + ### Added - Added the ability to run partial playgrounds @@ -167,10 +167,10 @@ - Fixed an issue with the launch shell command in powershell - Fixed an issue with the tree explorer freezing when double clicking an open schema - - -## [v0.0.4](https://github.com/mongodb-js/vscode/releases/tag/v0.0.4) - 2020-06-17 - + + +## [v0.0.4](https://github.com/mongodb-js/vscode/releases/tag/v0.0.4) - 2020-06-17 + ### Added - Added `Launch MongoDB Shell` right click action for the active connection in the tree view @@ -184,11 +184,11 @@ ### Changed -- Connections in the tree view are now alphabetically sorted - - -## [v0.0.3](https://github.com/mongodb-js/vscode/releases/tag/v0.0.3) - 2020-05-26 - +- Connections in the tree view are now alphabetically sorted + + +## [v0.0.3](https://github.com/mongodb-js/vscode/releases/tag/v0.0.3) - 2020-05-26 + ### Added - Added `require` support in playgrounds @@ -198,11 +198,11 @@ - Fixed an issue with file pathing on SSL and SSH connections on windows - Fixed an issue with connecting to mongodb through the shell while using SSH - Fixed a connectivity issue with playgrounds and SSH connections -- Fixed an issue with having a babel config in a workspace root - - -## [v0.0.2](https://github.com/mongodb-js/vscode/releases/tag/v0.0.2) - 2020-05-13 - +- Fixed an issue with having a babel config in a workspace root + + +## [v0.0.2](https://github.com/mongodb-js/vscode/releases/tag/v0.0.2) - 2020-05-13 + This is the marketplace preview release of MongoDB for VS Code. * MongoDB data explorer @@ -211,6 +211,5 @@ This is the marketplace preview release of MongoDB for VS Code. Take a look at [README.md](https://github.com/mongodb-js/vscode/blob/master/README.md) for an overview of the features. -This release can be found on the VS Code marketplace: https://marketplace.visualstudio.com/items?itemName=mongodb.mongodb-vscode - - +This release can be found on the VS Code marketplace: https://marketplace.visualstudio.com/items?itemName=mongodb.mongodb-vscode + diff --git a/README.md b/README.md index a4c9c7690..724b8a68e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MongoDB for VS Code ![PREVIEW](https://img.shields.io/badge/-PREVIEW-orange) -[![Build Status](https://dev.azure.com/team-compass/vscode/_apis/build/status/mongodb-js.vscode?branchName=master)](https://dev.azure.com/team-compass/vscode/_build/latest?definitionId=10&branchName=master) +[![Build Status](https://dev.azure.com/team-compass/vscode/_apis/build/status/mongodb-js.vscode?branchName=main)](https://dev.azure.com/team-compass/vscode/_build/latest?definitionId=10&branchName=main) MongoDB for VS Code makes it easy to work with MongoDB, whether your own instance or in [MongoDB Atlas](https://www.mongodb.com/cloud/atlas/register). diff --git a/src/explorer/helpTree.ts b/src/explorer/helpTree.ts index 47ed525b1..c23fbd243 100644 --- a/src/explorer/helpTree.ts +++ b/src/explorer/helpTree.ts @@ -68,7 +68,7 @@ export default class HelpTree implements vscode.TreeDataProvider