Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce changelog process #61

Merged
merged 2 commits into from
Sep 10, 2024
Merged

Conversation

KonradStaniec
Copy link
Collaborator

@KonradStaniec KonradStaniec requested a review from a team as a code owner September 9, 2024 13:04
@KonradStaniec KonradStaniec requested review from gitferry and Lazar955 and removed request for a team September 9, 2024 13:04
* After final release is made e.g `v0.Y.0`, backport changelog changes to `main` branch
* checkout a new branch from the main branch: `username/backport_changelog`
* bring the new section from `release/v0.Y.x` branch to the `CHANGELOG.md` file on `main` branch
* open pr against the `main` branch
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* open pr against the `main` branch
* open PR against the `main` branch

Copy link
Contributor

@RafilxTenfen RafilxTenfen left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@maurolacy maurolacy left a comment

Choose a reason for hiding this comment

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

OK with me. This would require more manual work than with automated changelog generation, but the format and the content of the changelog file would be generally better (as long as the manual process is followed, of course).

As part of this, let's then remove the upate_changelog.sh script as well.

Copy link
Member

@Lazar955 Lazar955 left a comment

Choose a reason for hiding this comment

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

LGTM

CONTRIBUTING.md Outdated
@@ -120,6 +121,25 @@ affect production code).
If you open a PR in Babylon, it is mandatory to update the relevant
documentation in `/docs`.

### Updating Changelog

Any pr which is merged to `main` and affects consumers of the codebase,
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Any pr which is merged to `main` and affects consumers of the codebase,
Any PR which is merged to `main` and affects consumers of the codebase,

@@ -41,6 +41,9 @@ branch (see [CONTRIBUTING.md](./CONTRIBUTING.md#pull-requests)).
the minor version number, with patch part substituted to `x` (eg: v0.11.x).
* **PRs targeting directly a release branch can be merged _only_ when
exceptional circumstances arise**.
* In the release branch
* Create by a PR, new version section in the `CHANGELOG.md` matching the released version e.g
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
* Create by a PR, new version section in the `CHANGELOG.md` matching the released version e.g
* Created by a PR, a new version section in the `CHANGELOG.md` matching the released version e.g

@@ -53,12 +56,19 @@ branch (see [CONTRIBUTING.md](./CONTRIBUTING.md#pull-requests)).
* The release verification on devnet must pass.
* When bugs are found, create a PR for `main`, and backport fixes to the
release branch.
* Before tagging release, create and merge pr to release branch that:
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
* Before tagging release, create and merge pr to release branch that:
* Before tagging the release, create and merge PR to the release branch that:

Copy link
Contributor

@gitferry gitferry left a comment

Choose a reason for hiding this comment

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

LGTM! Some nits:

CONTRIBUTING.md Outdated
- adding new api
- adding new feature

Examples of changed that do not require changelog updates:
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Examples of changed that do not require changelog updates:
Examples of changes that do not require changelog updates:

CONTRIBUTING.md Outdated
- modifying documentation

The rule of thumb here it that changelog should be updated whenever change is
visible by external user.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
visible by external user.
visible by external users.

@@ -53,12 +56,19 @@ branch (see [CONTRIBUTING.md](./CONTRIBUTING.md#pull-requests)).
* The release verification on devnet must pass.
* When bugs are found, create a PR for `main`, and backport fixes to the
release branch.
* Before tagging release, create and merge pr to release branch that:
* Moves all changelog entries form `Unreleased` section of the changelog to newly created section `v0.Y.0`
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* Moves all changelog entries form `Unreleased` section of the changelog to newly created section `v0.Y.0`
* Moves all changelog entries form `Unreleased` section of the changelog to the newly created section `v0.Y.0`

* Create new release candidate tags after bugs are fixed.
* After the team feels the release candidate is ready, create a full release:
* **Note:** The final release MUST have the same commit hash as the latest
corresponding release candidate.
* Create a new annotated git tag in the release branch (follow the [Tagging
Procedure](#tagging-procedure))
* After final release is made e.g `v0.Y.0`, backport changelog changes to `main` branch
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
* After final release is made e.g `v0.Y.0`, backport changelog changes to `main` branch
* After the final release is made e.g `v0.Y.0`, backport changelog changes to the `main` branch

* checkout a new branch from the main branch: `username/backport_changelog`
* bring the new section from `release/v0.Y.x` branch to the `CHANGELOG.md` file on `main` branch
* open pr against the `main` branch

Copy link
Contributor

Choose a reason for hiding this comment

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

blank line?

CONTRIBUTING.md Outdated
Comment on lines 131 to 133
- bug fix
- adding new api
- adding new feature
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- bug fix
- adding new api
- adding new feature
- bug fixes
- adding new APIs
- adding new features

CONTRIBUTING.md Outdated
- adding new tests
- modifying documentation

The rule of thumb here it that changelog should be updated whenever change is
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
The rule of thumb here it that changelog should be updated whenever change is
The rule of thumb here is that the changelog should be updated as long as the is

@KonradStaniec KonradStaniec merged commit 4758adf into main Sep 10, 2024
17 checks passed
@KonradStaniec KonradStaniec deleted the konradstaniec/introduce-changelog branch September 10, 2024 07:15
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