From 6e453b6a6aff7a195d1a2a2673797cd428cb91bc Mon Sep 17 00:00:00 2001 From: Rootul P Date: Thu, 21 Nov 2024 16:52:19 -0500 Subject: [PATCH 1/2] ci: enable backport:v3.x label --- .github/mergify.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/mergify.yml b/.github/mergify.yml index f32c3fafcf..2938889572 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -15,6 +15,14 @@ pull_request_rules: backport: branches: - v2.x + - name: backport patches to v3.x branch + conditions: + - base=main + - label=backport:v3.x + actions: + backport: + branches: + - v3.x - name: forward-port patches to main branch (v1.x) conditions: - base=v1.x From b763d0736386c46eb6ea4ebcc8c9252b14e19786 Mon Sep 17 00:00:00 2001 From: Rootul Patel Date: Fri, 22 Nov 2024 09:02:23 -0500 Subject: [PATCH 2/2] fix: lint --- .github/mergify.yml | 2 +- docs/maintainers/release-guide.md | 2 +- docs/release-notes/release-notes.md | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 2938889572..73fb720010 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -22,7 +22,7 @@ pull_request_rules: actions: backport: branches: - - v3.x + - v3.x - name: forward-port patches to main branch (v1.x) conditions: - base=v1.x diff --git a/docs/maintainers/release-guide.md b/docs/maintainers/release-guide.md index beaf1b69e9..3bc1d1835a 100644 --- a/docs/maintainers/release-guide.md +++ b/docs/maintainers/release-guide.md @@ -32,7 +32,7 @@ Follow the [creating a release candidate](#creating-a-release-candidate) section - The version tag should not include the `-rc` suffix. - If the release targets a testnet, suffix the release with `-arabica` or `-mocha`. - The release notes should contain an **Upgrade Notice** section with notable changes for node operators or library consumers. -- The release notes section should contain a link to https://github.com/celestiaorg/celestia-app/blob/main/docs/release-notes/release-notes.md where we capture breaking changes +- The release notes section should contain a link to where we capture breaking changes After creating the release: diff --git a/docs/release-notes/release-notes.md b/docs/release-notes/release-notes.md index 48e72f45ee..a692d2d71d 100644 --- a/docs/release-notes/release-notes.md +++ b/docs/release-notes/release-notes.md @@ -9,10 +9,10 @@ This guide provides notes for major version releases. These notes may be helpful #### Enabling BBR and MCTCP Consensus node operators must enable the BBR (Bottleneck Bandwidth and Round-trip propagation time) congestion control algorithm. See [#3774](https://github.com/celestiaorg/celestia-app/pull/3774). -if using linux in docker, kubernetes, a vm or baremetal, this can be done by calling +if using linux in docker, kubernetes, a vm or baremetal, this can be done by calling ```sh -make enable-bbr +make enable-bbr ``` command on the host machine. @@ -54,7 +54,7 @@ You can track the tally of signalling by validators using the following query celestia-appd query signal tally 3 ``` -Once 5/6+ of the voting power have signalled, the upgrade will be ready. There is a hard coded delay between confirmation of the upgrade and execution to the new state machine. +Once 5/6+ of the voting power have signalled, the upgrade will be ready. There is a hard coded delay between confirmation of the upgrade and execution to the new state machine. To view the upcoming upgrade height use the following query: