Skip to content

readme: update docs around doing releases#1985

Merged
mslipper merged 2 commits intodevelopfrom
fix/release-readme
Mar 3, 2022
Merged

readme: update docs around doing releases#1985
mslipper merged 2 commits intodevelopfrom
fix/release-readme

Conversation

@tynes
Copy link
Contributor

@tynes tynes commented Jan 5, 2022

Description
Update the docs in the README for how to do releases. This information was already documented, just adding a bit more to prevent future problems.

@changeset-bot
Copy link

changeset-bot bot commented Jan 5, 2022

⚠️ No Changeset found

Latest commit: 624f4b3

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@codecov-commenter
Copy link

codecov-commenter commented Jan 5, 2022

Codecov Report

Merging #1985 (a47e9e8) into develop (a21cec6) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #1985   +/-   ##
========================================
  Coverage    74.42%   74.42%           
========================================
  Files           79       79           
  Lines         2545     2545           
  Branches       397      397           
========================================
  Hits          1894     1894           
  Misses         651      651           
Flag Coverage Δ
batch-submitter 62.50% <ø> (ø)
contracts 90.48% <ø> (ø)
core-utils 57.50% <ø> (ø)
data-transport-layer 38.64% <ø> (ø)
message-relayer 70.86% <ø> (ø)
sdk 87.06% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a21cec6...a47e9e8. Read the comment docs.

### Release new versions

Developers can release new versions of the software by adding changesets to their pull requests using `yarn changeset`. Changesets will persist over time on the `develop` branch without triggering new version bumps to be proposed by the Changesets bot. Once changesets are merged into `master`, the bot will create a new pull request called "Version Packages" which bumps the versions of packages. The correct flow for triggering releases is to re-base these pull requests onto `develop` and merge them, and then create a new pull request to merge `develop` onto `master`. Then, the `release` workflow will trigger the actual publishing to `npm` and Docker hub.
Developers can release new versions of the software by adding changesets to their pull requests using `yarn changeset`. Changesets will persist over time on the `develop` branch without triggering new version bumps to be proposed by the Changesets bot. Once changesets are merged into `master`, the bot will create a new pull request called "Version Packages" which bumps the versions of packages. The correct flow for triggering releases is to update the base branch of these pull requests onto `develop` and merge them, and then create a new pull request to merge `develop` into `master`. Then, the `release` workflow will trigger the actual publishing to `npm` and Docker hub.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens if "Version Packages" PR gets merged to master? Won't that trigger the release properly as well? Don't quite get why merge to develop them master again

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then master and develop would diverge.
Practically, the packages would be build from master fine (I tihnk), but the changeset files would not be removed from develop and the next dev -> master will try and add then again.

Copy link
Contributor

@elenadimitrova elenadimitrova Jan 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But we can merge the same branch to master and also to develop and we'll have the same "Version Packages" commit in both, why all the complexities with PRs? Can't we just do

$ git checkout master
$ git merge --no-ff version-packages-branch
$ git checkout develop
$ git merge --no-ff version-packages-branch

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have strong opinion on how the task is accomplished, only that the functionality and necessary steps are documented 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not super opinionated on how its done either as long as it works. The existing workflow is done via the github ui which is why it works the way it does. Doing it via git would mean that pushing to master is enabled and that the changesets workflow is setup to work on pushes and then we'd have to close the PR on github (unless its smart enough to auto detect merge on push)

Copy link
Contributor

@elenadimitrova elenadimitrova Jan 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest we reword this section

The correct flow for triggering releases is to update the base branch of these pull requests onto develop and merge them, and then create a new pull request to merge develop into master. Then, the release workflow will trigger the actual publishing to npm and Docker hub.

to

"The correct flow for triggering releases is to first merge the branch of these pull requests into develop via

$ git checkout develop
$ git merge --no-ff changeset-release/master

and then merge the PR to maser. Then, the release workflow will trigger the actual publishing to npm and Docker hub."
We don;t need to push to master this way but we can still avoid the convoluted PR mechanism cc @tynes

@mslipper
Copy link
Collaborator

mslipper commented Mar 3, 2022

We generally need to rethink the changesets process. Until then, I'm approving this since it's better to at least have the bad process documented.

@mslipper mslipper merged commit daee731 into develop Mar 3, 2022
@mslipper mslipper deleted the fix/release-readme branch March 3, 2022 00:42
theochap pushed a commit that referenced this pull request Dec 10, 2025
### Description

Adds metrics around frames and channels in the pipeline stages.

Closes #1985
Closes #1992

---------

Co-authored-by: clabby <ben@clab.by>
theochap pushed a commit that referenced this pull request Jan 14, 2026
### Description

Adds metrics around frames and channels in the pipeline stages.

Closes #1985
Closes #1992

---------

Co-authored-by: clabby <ben@clab.by>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants