Skip to content

Commit

Permalink
Merge branch 'develop' into omerfirmak/fix-stuck-reorg
Browse files Browse the repository at this point in the history
  • Loading branch information
colinlyguo authored Sep 20, 2024
2 parents 4726f8b + f044582 commit 8ad7469
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions Dockerfile.mockccc
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as builder
ADD . /go-ethereum
RUN cd /go-ethereum && env GO111MODULE=on go run build/ci.go install ./cmd/geth

RUN cd /go-ethereum && env GO111MODULE=on go run build/ci.go install ./cmd/geth

# Pull Geth into a second stage deploy alpine container
FROM ubuntu:20.04

Expand Down
2 changes: 1 addition & 1 deletion params/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
const (
VersionMajor = 5 // Major version component of the current release
VersionMinor = 7 // Minor version component of the current release
VersionPatch = 17 // Patch version component of the current release
VersionPatch = 18 // Patch version component of the current release
VersionMeta = "mainnet" // Version metadata to append to the version string
)

Expand Down

0 comments on commit 8ad7469

Please sign in to comment.