Skip to content

Update docs and CI references for v0.38.x backport branch#596

Merged
thanethomson merged 7 commits intov0.38.xfrom
thane/595-prep-v0.38.x-docs
Mar 28, 2023
Merged

Update docs and CI references for v0.38.x backport branch#596
thanethomson merged 7 commits intov0.38.xfrom
thane/595-prep-v0.38.x-docs

Conversation

@thanethomson
Copy link
Contributor

@thanethomson thanethomson commented Mar 28, 2023

Partially addresses #33 (specifically #595), following the backport branch creation steps in https://github.com/cometbft/cometbft/blob/main/RELEASES.md#creating-a-backport-branch

Can be reviewed commit by commit.


PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments

Signed-off-by: Thane Thomson <connect@thanethomson.com>
Signed-off-by: Thane Thomson <connect@thanethomson.com>
Signed-off-by: Thane Thomson <connect@thanethomson.com>
Signed-off-by: Thane Thomson <connect@thanethomson.com>
Signed-off-by: Thane Thomson <connect@thanethomson.com>
@thanethomson thanethomson requested review from a team as code owners March 28, 2023 00:15
@thanethomson thanethomson mentioned this pull request Mar 28, 2023
5 tasks
@thanethomson thanethomson changed the title Prepare documentation references for v0.38.x backport branch Update docs references for v0.38.x backport branch Mar 28, 2023
@thanethomson thanethomson modified the milestone: 2023-Q1 Mar 28, 2023
@thanethomson thanethomson changed the title Update docs references for v0.38.x backport branch Update docs and CI references for v0.38.x backport branch Mar 28, 2023
Signed-off-by: Thane Thomson <connect@thanethomson.com>
Signed-off-by: Thane Thomson <connect@thanethomson.com>
pull_request:
branches: [main]
branches:
- v0.38.x
Copy link
Collaborator

Choose a reason for hiding this comment

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

I assume the difference in the notaion has no impact?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, YAML allows one to represent arrays both ways. We tend to use this convention more than the [main] one though, so I thought I'd adapt it to the conventional way.

@thanethomson thanethomson merged commit b0ea374 into v0.38.x Mar 28, 2023
@thanethomson thanethomson deleted the thane/595-prep-v0.38.x-docs branch March 28, 2023 14:40
Copy link
Contributor

@lasarojc lasarojc left a comment

Choose a reason for hiding this comment

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

Some changes are not needed and should be done on main instead.
Some of the links replaced could be made relative, on main, so there is no need to update them in future forks.
Other than that, LGTM

name: Build
# Tests runs different tests (test_abci_apps, test_abci_cli, test_apps)
# This workflow runs on every push to main or release branch and every pull requests
# This workflow runs on every push to v0.38.x and every pull request
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we replace for a generic comment instead? This way this will not have to be changed on every new branch.

Copy link
Contributor

Choose a reason for hiding this comment

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

should be done in main, rather.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will do that in a follow-up PR 👍

push:
branches:
- main
- v0.38.x
Copy link
Contributor

Choose a reason for hiding this comment

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

could we use - 'v*.*.*' on main, to simplify these releases?

const timeIota = time.Millisecond
// TODO: We should remove next line in case we don't vote for v in case cs.ProposalBlock == nil,
// even if cs.LockedBlock != nil. See https://github.com/cometbft/cometbft/tree/main/spec/.
// even if cs.LockedBlock != nil. See https://github.com/cometbft/cometbft/tree/v0.38.x/spec/.
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
// even if cs.LockedBlock != nil. See https://github.com/cometbft/cometbft/tree/v0.38.x/spec/.
// even if cs.LockedBlock != nil.
// See the BFT time spec https://github.com/cometbft/cometbft/blob/v0.38.x/spec/consensus/bft-time.md.

Comment on lines 2351 to +2352
// See the BFT time spec
// https://github.com/cometbft/cometbft/blob/main/spec/consensus/bft-time.md
// https://github.com/cometbft/cometbft/blob/v0.38.x/spec/consensus/bft-time.md
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
// See the BFT time spec
// https://github.com/cometbft/cometbft/blob/main/spec/consensus/bft-time.md
// https://github.com/cometbft/cometbft/blob/v0.38.x/spec/consensus/bft-time.md

}

var pbb = new(cmtproto.Block)
pbb := new(cmtproto.Block)
Copy link
Contributor

Choose a reason for hiding this comment

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

this one should be done in main and backported.

ev types.Evidence) (*ctypes.ResultBroadcastEvidence, error) {

ev types.Evidence,
) (*ctypes.ResultBroadcastEvidence, error) {
Copy link
Contributor

Choose a reason for hiding this comment

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

not needed

Total: env.Mempool.Size(),
TotalBytes: env.Mempool.SizeBytes(),
Txs: txs}, nil
Txs: txs,
Copy link
Contributor

Choose a reason for hiding this comment

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

not needed

license:
name: Apache 2.0
url: https://github.com/cometbft/cometbft/blob/main/LICENSE
url: https://github.com/cometbft/cometbft/blob/v0.38.x/LICENSE
Copy link
Contributor

Choose a reason for hiding this comment

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

the license shouldn't change. the link could stay as main.

var (
commit = new(Commit)
)
commit := new(Commit)
Copy link
Contributor

Choose a reason for hiding this comment

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

not needed. do it in main.

Existing documentation referring to the p2p layer:

- <https://github.com/cometbft/cometbft/tree/main/spec/p2p>: p2p-related
- <https://github.com/cometbft/cometbft/tree/v0.38.x/spec/p2p>: p2p-related
Copy link
Contributor

Choose a reason for hiding this comment

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

should we make these links relative, so they get locked by branch automatically?

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 think we need a bigger effort to make as many of the docs' links relative as we can.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants