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

Update release branch #306

Merged
merged 6 commits into from
Feb 6, 2025
Merged

Conversation

piersy
Copy link

@piersy piersy commented Feb 5, 2025

Updating the release branch with these fixes and the latest version of geth from the corresponding release branch (celo-release-v2.0) in op-geth.

piersy and others added 2 commits February 4, 2025 16:40
The script was not substituting the go.mod file and the Dockerfile since the
regexes were not matching.

The regex for the Dockerfile contained '@sha256:' which perl was
interpreting as a global symbol, in order to interpret it literally we
needed to escape the '@'.

The regex for the go.mod file contained an extra space before the arrow
'go-ethereum .* => ', in a tidied go.mod file there is one space between
the package name and the arrow '=>'.

Also adds failure output so that it's easier to debug where this is
going wrong.

---------

Co-authored-by: Karl Bartel <[email protected]>
Co-authored-by: Paul Lange <[email protected]>
@piersy piersy requested a review from karlb February 5, 2025 08:58
@piersy piersy marked this pull request as draft February 5, 2025 10:25
The substitution \1 and the beginning of the image hash together created
\150 which perl interprets as the octal character code for h.

To prevent this we need to use the \${1} notation to reference captured
groups.
@piersy piersy force-pushed the piersy/update-release-branch branch from 4444de3 to de5edc2 Compare February 5, 2025 16:12
@piersy piersy requested a review from palango February 5, 2025 16:13
@piersy piersy marked this pull request as ready for review February 5, 2025 16:13
@palango
Copy link
Collaborator

palango commented Feb 5, 2025

Still some errors:

=== Errors
cmd/celo-migrate/state.go:93:33: undefined: addresses.AlfajoresAddresses
cmd/celo-migrate/state.go:94:33: undefined: addresses.BaklavaAddresses
cmd/celo-migrate/state.go:95:33: undefined: addresses.MainnetAddresses

@piersy piersy force-pushed the piersy/update-release-branch branch from de5edc2 to ffba5ac Compare February 5, 2025 16:48
Copy link

socket-security bot commented Feb 5, 2025

No dependency changes detected. Learn more about Socket for GitHub ↗︎

👍 No dependency changes detected in pull request

@piersy piersy force-pushed the piersy/update-release-branch branch from e945c41 to d28f4f0 Compare February 5, 2025 18:28
@palango palango merged commit 9cc2c91 into celo-release-v2.0 Feb 6, 2025
56 of 57 checks passed
@palango palango deleted the piersy/update-release-branch branch February 6, 2025 14:48
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.

2 participants