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

Merge master v3.1.2 into release #82

Merged
merged 15 commits into from
Sep 17, 2024
Merged

Conversation

Tristan-Wilson
Copy link
Member

We shouldn't merge this until #81 is merged into master.

PlasmaPower and others added 15 commits July 31, 2024 16:03
Bump blockscout pin to include ABI change
The concepts of using the dev builds for nitro and blockscout and
rebuilding are now split into different variables internally to the
test-node.bash script and can be controlled independently.

The --dev flag by itself means to use the dev builds and to rebuild
them. --no-build-dev-nitro and -no-build-dev-blockscout disable
rebuilding the respective dev images. --no-build disables rebuilding the
dev images and also rebuilding contracts related images, and the node
images. This finer grained control saves time in the development cycle
by allowing the user to rebuild only what is needed.

An example command line to reinitialize the blockchain, use the dev
images, but not rebuild anything except blockscout would be:
./test-node.bash --init --dev --no-build --build-dev-blockscout --blockscout

Flags are read from left to right; flags to the right cancel
the effects of flags to the left.
These updated versions are needed to work with the consensus-v31
release.
Upgrade to the consensus-v31 release
Clarify logic around dev builds and rebuilding
Resolve conflicting changes to node image and nitro contracts versions
in master from 8ec2131, which conflicted with the release branch in
dbf27b6 and 7ac0d6e. Take release branch's version of both since they
represent newer versions.
@tsahee tsahee marked this pull request as ready for review September 17, 2024 04:31
Copy link
Collaborator

@tsahee tsahee left a comment

Choose a reason for hiding this comment

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

OK

Copy link
Collaborator

@tsahee tsahee left a comment

Choose a reason for hiding this comment

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

OK

@tsahee tsahee merged commit 00548dd into release Sep 17, 2024
4 checks passed
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