Skip to content

Commit

Permalink
Merge branch 'develop' into phale/lc-version-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
peternhale authored Oct 13, 2023
2 parents 3b1aa92 + ba9dc91 commit 3aaf073
Show file tree
Hide file tree
Showing 42 changed files with 35,857 additions and 12,494 deletions.
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
# the repo. Unless a later match takes precedence,
# @forcedotcom/ide-experience will be requested for
# review when someone opens a pull request.

#ECCN:Open Source
#GUSINFO: Platform Dev Tools Scrum Team, IDE Experience Team
* @forcedotcom/ide-experience

# If the change occurs within the docs directory, add the doc maintainers.

/docs/ @forcedotcom/doc-maintainers
#ECCN:Open Source
#GUSINFO: Platform Dev Tools Scrum Team, IDE Experience Team
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ updates:
update-types: ["version-update:semver-major"]
open-pull-requests-limit: 10
rebase-strategy: disabled
versioning-strategy: increase
# Major version updates (not to be auto-merged)
- package-ecosystem: "npm"
directory: "/" # Location of package manifests
Expand All @@ -39,6 +40,7 @@ updates:
["version-update:semver-minor", "version-update:semver-patch"]
open-pull-requests-limit: 10
rebase-strategy: disabled
versioning-strategy: increase
# Exclude updates to doc tools
# TODO: Enable after adding automated check(s) for doc generation
- package-ecosystem: "bundler"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ on:
required: false
default: true
type: boolean
schedule:
- cron: 10 6 * * *

jobs:

Expand Down
22 changes: 11 additions & 11 deletions SHA256.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@ make sure that their SHA values match the values in the list below.
following the instructions at
https://code.visualstudio.com/docs/editor/extension-gallery#_common-questions.
For example, download,
https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/58.16.0/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage.
https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/59.0.0/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage.

2. From a terminal, run:

shasum -a 256 <location_of_the_downloaded_file>

3. Confirm that the SHA in your output matches the value in this list of SHAs.

b3f05daffaa00b8f99f9086db5b5a377a5fe2a53b5d9ff40f9cdcc7e6f7b03be salesforcedx-vscode-58.16.0.vsix
3f63222d83bec1d425ff6cee6a74c517d5a217ef41aaea664f2716c367413273 salesforcedx-vscode-apex-58.16.0.vsix
500bbe5d7ff2b049600dbc175888784599b477af1f87b351dd93314b4450c7ef salesforcedx-vscode-apex-debugger-58.16.0.vsix
4d4125ac06cee8895f76af7501fdbd03d92a7689a210d03eb39ca9cb55e46e40 salesforcedx-vscode-apex-replay-debugger-58.16.0.vsix
49df520e337c9b2520f13ae870ed881df513345e6921710e5c77912734395ed0 salesforcedx-vscode-core-58.16.0.vsix
932be01de9a0e28f0578dbcac6b80e2a93df4ebe3f460373eee2f7ea48fab459 salesforcedx-vscode-expanded-58.16.0.vsix
24462595e82a5b42949f395fcd3aef209a675f39ae3fbbec69c69410be67f30c salesforcedx-vscode-lightning-58.16.0.vsix
0cbc674c3f7705d0743a06fb63a1d16bd63783e9a4176cdd80b42377d77309c2 salesforcedx-vscode-lwc-58.16.0.vsix
b9242c47eb5b5324c2d5f0ed9f29cdc7dabc5e09e1ea249848d817a572061c34 salesforcedx-vscode-soql-58.16.0.vsix
a205183290b864cdbca9ebd15130015545a20b02b6d8867b41d8e85ec22d2b8d salesforcedx-vscode-visualforce-58.16.0.vsix
4dfb404d6a5e0ff1213a175554171ee81bb94a5720ab6fce7cd7cd9aa4709e12 salesforcedx-vscode-59.0.0.vsix
a2f1666ac40f4b85e6e31241acc906adea270290019b0890fe5fe031a5b42ce9 salesforcedx-vscode-apex-59.0.0.vsix
28f76046a6c865a705382331bcb7a4a86c4a1039c1b5dc8ad81949c4024f1e54 salesforcedx-vscode-apex-debugger-59.0.0.vsix
3795ec53b14df30cbdf52c187ebff9be7c7dd4960a36bb670ca6568d61c4b129 salesforcedx-vscode-apex-replay-debugger-59.0.0.vsix
b5296226df67bf3de6371b88a923513dba4d8d4a36f0965098571af59792e1d2 salesforcedx-vscode-core-59.0.0.vsix
7cff52bcd5f4f221164ea12db4629413f535ca6c874a1410e220a14cc1bed80a salesforcedx-vscode-expanded-59.0.0.vsix
cbb0395d6c48c03e83ee4c4fe70074966de398c4853ec85b31337310d7281d46 salesforcedx-vscode-lightning-59.0.0.vsix
1776db1ca7faf1b07a652d61410ba139fea825a29164df0c660a3a85c9b480f9 salesforcedx-vscode-lwc-59.0.0.vsix
23e74ecde899117e1378705589e4fbe0244f60ac04c79b5fdd4447aa57980bee salesforcedx-vscode-soql-59.0.0.vsix
602522b013fb5d259fc6bc52721b0f3d73850ea60624a1da95f20e94a515b549 salesforcedx-vscode-visualforce-59.0.0.vsix


4. Change the filename extension for the file that you downloaded from .zip to
Expand Down
21 changes: 9 additions & 12 deletions contributing/publishing.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Publishing

This is a guide for publishing to the Visual Studio Code Marketplace and the Open VSX Registry. Most contributors will not need to worry about publishing. However, it might be worthwhile familiarizing yourself with the steps in case you need to share the
extensions through the .vsix files.
This is a guide for publishing to the Visual Studio Code Marketplace and the Open VSX Registry. Most contributors will not need to worry about publishing. However, it might be worthwhile familiarizing yourself with the steps in case you need to share the extensions through the .vsix files.

# Goal

Expand All @@ -23,17 +22,15 @@ For more information about publishing take a look at:

## Creating a Release Branch

The release branch is typically created from a scheduled job in GitHub Actions. This scheduled job creates the release branch off of the `develop` branch on Mondays at 3 PM GMT (i.e. 7AM or 8AM Pacific time depending on daylight savings). Release branches are in the format of `release/vXX.YY.ZZ`.
The release branch is typically created from a scheduled job in GitHub Actions. This scheduled job creates the release branch off of the `develop` branch on Mondays at 1PM GMT (i.e. 5AM or 6AM Pacific time depending on daylight savings). Release branches are in the format of `release/vXX.YY.ZZ`.

## Updating the Change Log

After the release branch is created, the changelog should be updated. To do so, our [Doc Maintainer](https://github.com/orgs/forcedotcom/teams/doc-maintainers/members) should run the VS Code task `Update Change Log` on Monday. This task takes an optional `releaseOverride` parameter for the release version in the format of `v57.13.1`. If this is omitted, the latest created release branch will be used. The task will gather commits that should be published (like `feat` or `fix`), write the update to `CHANGELOG.md` and then open the file for review.
If any code changes are made between the time the release branch is automatically created and the actual release time, the engineer should run the `Create Release Branch` workflow with `patch` selected from the dropdown to create a new branch that contains those code changes.

Once the writer is content with the changes, they should commit the changes in the format `chore: generated CHANGELOG for ${releaseBranchName}"`, and push the update to the release branch.
## Updating the Change Log

If the writer wants to make further changes to changelog through browser, they can do the same by switching the branch from develop to release/vxx.xx.x and go to changelog.md and click on the pencil icon to edit the file.
After the release branch is created, the changelog needs to be updated. To do so, the engineer should go into VSCode, pull the latest changes, and switch to the release branch. Then, they should open a Terminal window and run `npm run changelog` to generate the changelog entry for the upcoming release. This task will gather commits that should be published (like `feat` or `fix`) and write the update to `CHANGELOG.md`. If there are no commits worth publishing (for instance, if everything was a `chore` or a `ci` commit), then the changelog entry for the upcoming release can be skipped. If a changelog is necessary, the engineer will then push the changelog to the release branch with the commit name of `chore: generated CHANGELOG for vXX.YY.ZZ`, where XX.YY.ZZ are the numbers of the current release.

If there are no commits worth publishing (for instance, if everything was a `chore` or a `ci` commit), the task will end by printing a message that the release can be skipped.
The engineer should work with the team and doc writer to update and finalize the contents of the changelog. During the update process, if the writer wants to make further changes to changelog through the browser, they can do that by switching the branch from develop to release/vXX.YY.ZZ and go to `CHANGELOG.md` and clicking on the pencil icon to edit the file.

## Compare Changes in the Release

Expand All @@ -43,13 +40,13 @@ If no changes were made the previous week, then the release can be skipped.

## Merging the Release Branch into Main

After the change log has been approved and merged into your release branch, it's time to prepare the `main` branch with the new changes for the publish. A GitHub Action workflow is executed to merge the release branch. We are specifically using the rebase strategy because we want all the commits from our release branch to be applied on top of the commits in the `main` branch.
After everyone is satisfied with the changelog updates, it's time to prepare the `main` branch with the new changes for the publish. A GitHub Action workflow is executed to merge the release branch. We are specifically using the rebase strategy because we want all the commits from our release branch to be applied on top of the commits in the `main` branch.

### To run the merge process:

1. From the GitHub repository navigate to the Action Tab, and Select the PreRelease workflow on the left
1. From the GitHub repository navigate to the Actions tab, and select the PreRelease workflow on the left
1. Click the 'Run Workflow' dropdown button on the right
1. In the form that appears, set the branch to `develop`, and set the 'branch to be released' input box to the name of the release (eg `release/v56.0.0`)
1. In the form that appears, set the branch to `develop`, and set the 'branch to be released' input box to the name of the release (eg `release/v58.0.0`)
1. Click the 'Run Workflow' button.

The PreRelease job will verify if the version of the branch to be merged is newer than what is currently in the `main` branch and update `main` with the release branch.
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "docs",
"version": "58.16.0",
"version": "59.0.0",
"description": "",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"docs",
"packages/*"
],
"version": "58.16.0",
"version": "59.0.0",
"command": {
"version": {
"allowBranch": [
Expand Down
Loading

0 comments on commit 3aaf073

Please sign in to comment.