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

chore: merge release/v1.28.0 / v1.28.0-rc4 back to master #12211

Merged
merged 16 commits into from
Jul 12, 2024

Conversation

rjan90
Copy link
Contributor

@rjan90 rjan90 commented Jul 11, 2024

During the prep of shipping Lotus v1.28.0-rc2/rc3/rc4 we added the Calibration network upgrade epoch, but we did not land this change in master.

Proposed Changes

  • Merge release/v1.28.0 branch back into master.
  • Update version to v1.28.1-dev in master.

Checklist

Before you mark the PR ready for review, please make sure that:

  • Commits have a clear commit message.
  • PR title is in the form of of <PR type>: <area>: <change being made>
    • example: fix: mempool: Introduce a cache for valid signatures
    • PR type: fix, feat, build, chore, ci, docs, perf, refactor, revert, style, test
    • area, e.g. api, chain, state, mempool, multisig, networking, paych, proving, sealing, wallet, deps
  • Update CHANGELOG.md or signal that this change does not need it.
    • If the PR affects users (e.g., new feature, bug fix, system requirements change), update the CHANGELOG.md and add details to the UNRELEASED section.
    • If the change does not require a CHANGELOG.md entry, do one of the following:
      • Add [skip changelog] to the PR title
      • Add the label skip/changelog to the PR
  • New features have usage guidelines and / or documentation updates in
  • Tests exist for new functionality or change in behavior
  • CI is green

jennijuju and others added 15 commits July 11, 2024 11:07
Co-authored-by: Phi-rjan <orjan.roren@gmail.com>
Co-authored-by: Masih H. Derkani <m@derkani.org>
* v1.28.0-rc3

* Update CHANGELOG.md

Co-authored-by: Phi-rjan <orjan.roren@gmail.com>

* Update CHANGELOG.md

---------

Co-authored-by: Phi-rjan <orjan.roren@gmail.com>
* Fix F3 build parameters for `testground` target

Fix renamed `f3Enabled` flag and while at it, add place holder for
manifest server ID.

Fixes #12188

* Update changelog and version

Update changelog and version

---------

Co-authored-by: Masih H. Derkani <m@derkani.org>
Update version master
@rjan90 rjan90 requested a review from rvagg July 11, 2024 10:09
@rjan90 rjan90 enabled auto-merge (squash) July 12, 2024 07:09
@rjan90 rjan90 merged commit 105b456 into master Jul 12, 2024
79 checks passed
@rjan90 rjan90 deleted the phi/mergeback-v1280-rc4 branch July 12, 2024 07:10
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.

4 participants