good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
Erigon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
a
Erigon
Commits
eca39e12
Unverified
Commit
eca39e12
authored
Sep 11, 2020
by
Igor Mandrigin
Committed by
GitHub
Sep 11, 2020
Browse files
Options
Downloads
Patches
Plain Diff
Fix reproducible builds (#1099)
parent
5339ca09
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+2
-2
2 additions, 2 deletions
Makefile
cmd/tg/main.go
+2
-3
2 additions, 3 deletions
cmd/tg/main.go
turbo/node/node.go
+2
-3
2 additions, 3 deletions
turbo/node/node.go
with
6 additions
and
8 deletions
Makefile
+
2
−
2
View file @
eca39e12
...
@@ -21,12 +21,12 @@ docker-compose:
...
@@ -21,12 +21,12 @@ docker-compose:
docker-compose up
docker-compose up
geth
:
geth
:
$(
GOBUILD
)
-o
$(
GOBIN
)
/tg
-ldflags
"-X main.
G
itCommit=
${
GIT_COMMIT
}
-X main.GitDate=
$(
shell date +%Y.%m.%d.%H%M%S
)
"
./cmd/tg
$(
GOBUILD
)
-o
$(
GOBIN
)
/tg
-ldflags
"-X main.
g
itCommit=
${
GIT_COMMIT
}
"
./cmd/tg
@
echo
"Done building."
@
echo
"Done building."
@
echo
"Run
\"
$(
GOBIN
)
/tg
\"
to launch turbo-geth."
@
echo
"Run
\"
$(
GOBIN
)
/tg
\"
to launch turbo-geth."
tg
:
tg
:
$(
GOBUILD
)
-o
$(
GOBIN
)
/tg
-ldflags
"-X main.
G
itCommit=
${
GIT_COMMIT
}
-X main.GitDate=
$(
shell date +%Y.%m.%d.%H%M%S
)
"
./cmd/tg
$(
GOBUILD
)
-o
$(
GOBIN
)
/tg
-ldflags
"-X main.
g
itCommit=
${
GIT_COMMIT
}
"
./cmd/tg
@
echo
"Done building."
@
echo
"Done building."
@
echo
"Run
\"
$(
GOBIN
)
/tg
\"
to launch turbo-geth."
@
echo
"Run
\"
$(
GOBIN
)
/tg
\"
to launch turbo-geth."
...
...
This diff is collapsed.
Click to expand it.
cmd/tg/main.go
+
2
−
3
View file @
eca39e12
...
@@ -14,8 +14,7 @@ import (
...
@@ -14,8 +14,7 @@ import (
)
)
var
(
var
(
GitCommit
string
gitCommit
string
GitDate
string
)
)
func
main
()
{
func
main
()
{
...
@@ -31,7 +30,7 @@ func runTurboGeth(ctx *cli.Context) {
...
@@ -31,7 +30,7 @@ func runTurboGeth(ctx *cli.Context) {
stagedsync
.
DefaultUnwindOrder
(),
stagedsync
.
DefaultUnwindOrder
(),
)
)
tg
:=
node
.
New
(
ctx
,
sync
,
node
.
Params
{
GitCommit
:
G
itCommit
,
GitDate
:
GitDate
})
tg
:=
node
.
New
(
ctx
,
sync
,
node
.
Params
{
GitCommit
:
g
itCommit
})
err
:=
tg
.
Serve
()
err
:=
tg
.
Serve
()
if
err
!=
nil
{
if
err
!=
nil
{
...
...
This diff is collapsed.
Click to expand it.
turbo/node/node.go
+
2
−
3
View file @
eca39e12
...
@@ -43,7 +43,6 @@ func (tg *TurboGethNode) run() {
...
@@ -43,7 +43,6 @@ func (tg *TurboGethNode) run() {
}
}
type
Params
struct
{
type
Params
struct
{
GitDate
string
GitCommit
string
GitCommit
string
CustomBuckets
dbutils
.
BucketsCfg
CustomBuckets
dbutils
.
BucketsCfg
}
}
...
@@ -75,8 +74,8 @@ func makeEthConfig(ctx *cli.Context, node *node.Node) *eth.Config {
...
@@ -75,8 +74,8 @@ func makeEthConfig(ctx *cli.Context, node *node.Node) *eth.Config {
func
makeNodeConfig
(
ctx
*
cli
.
Context
,
p
Params
)
*
node
.
Config
{
func
makeNodeConfig
(
ctx
*
cli
.
Context
,
p
Params
)
*
node
.
Config
{
nodeConfig
:=
node
.
DefaultConfig
nodeConfig
:=
node
.
DefaultConfig
// see simiar changes in `cmd/geth/config.go#defaultNodeConfig`
// see simiar changes in `cmd/geth/config.go#defaultNodeConfig`
if
commit
,
date
:=
p
.
GitCommit
,
p
.
GitDate
;
commit
!=
""
&&
date
!=
""
{
if
commit
:=
p
.
GitCommit
;
commit
!=
""
{
nodeConfig
.
Version
=
params
.
VersionWithCommit
(
commit
,
date
)
nodeConfig
.
Version
=
params
.
VersionWithCommit
(
commit
,
""
)
}
else
{
}
else
{
nodeConfig
.
Version
=
params
.
Version
nodeConfig
.
Version
=
params
.
Version
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment