Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
fcab7e06
Commit
fcab7e06
authored
Aug 27, 2019
by
mdj33
Committed by
vipwzw
Aug 28, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix linter
parent
b3a67a40
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
Makefile
Makefile
+5
-3
docker-compose.sh
build/docker-compose.sh
+3
-3
No files found.
Makefile
View file @
fcab7e06
...
@@ -10,8 +10,9 @@ SRC_CLI := github.com/33cn/plugin/cli
...
@@ -10,8 +10,9 @@ SRC_CLI := github.com/33cn/plugin/cli
APP
:=
build/chain33
APP
:=
build/chain33
CHAIN33
=
github.com/33cn/chain33
CHAIN33
=
github.com/33cn/chain33
CHAIN33_VERSION
=
$(
shell
nl
go.mod |grep
"github.com/33cn/chain33"
|awk
'{print $$3}'
)
CHAIN33_VERSION
=
$(
shell
nl
go.mod |grep
"github.com/33cn/chain33"
|awk
'{print $$3}'
)
export
CHAIN33_PATH
=
${
GOPATH
}
/pkg/mod/github.com/33cn/chain33@
${
CHAIN33_VERSION
}
GO_PATH
=
$(
shell
go
env
GOPATH
)
export
PLUGIN_PATH
=
${
GOPATH
}
/src/github.com/33cn/plugin
export
CHAIN33_PATH
=
${
GO_PATH
}
/pkg/mod/github.com/33cn/chain33@
${
CHAIN33_VERSION
}
export
PLUGIN_PATH
=
${
GO_PATH
}
/src/github.com/33cn/plugin
BUILD_FLAGS
=
-ldflags
"-X
${
CHAIN33_PATH
}
/common/version.GitCommit=
`
git rev-parse
--short
=
8 HEAD
`
"
BUILD_FLAGS
=
-ldflags
"-X
${
CHAIN33_PATH
}
/common/version.GitCommit=
`
git rev-parse
--short
=
8 HEAD
`
"
LDFLAGS
:=
-ldflags
"-w -s"
LDFLAGS
:=
-ldflags
"-w -s"
PKG_LIST_VET
:=
`
go list ./... |
grep
-v
"vendor"
|
grep
-v
plugin/dapp/evm/executor/vm/common/crypto/bn256
`
PKG_LIST_VET
:=
`
go list ./... |
grep
-v
"vendor"
|
grep
-v
plugin/dapp/evm/executor/vm/common/crypto/bn256
`
...
@@ -27,7 +28,8 @@ default: depends build
...
@@ -27,7 +28,8 @@ default: depends build
build
:
depends
build
:
depends
go build
$(BUILD_FLAGS)
-v
-i
-o
$(APP)
go build
$(BUILD_FLAGS)
-v
-i
-o
$(APP)
go build
$(BUILD_FLAGS)
-v
-i
-o
$(CLI)
$(SRC_CLI)
go build
$(BUILD_FLAGS)
-v
-i
-o
$(CLI)
$(SRC_CLI)
@
cp
chain33.toml
$(CHAIN33_PATH)
/build/system-test-rpc.sh build/
@
cp
chain33.toml build/
cp
$(CHAIN33_PATH)
/build/system-test-rpc.sh build/
@
cp
chain33.para.toml build/ci/paracross/
@
cp
chain33.para.toml build/ci/paracross/
...
...
build/docker-compose.sh
View file @
fcab7e06
...
@@ -246,9 +246,9 @@ function block_wait2height() {
...
@@ -246,9 +246,9 @@ function block_wait2height() {
while
true
;
do
while
true
;
do
new_height
=
$(${
1
}
block last_header | jq
".height"
)
new_height
=
$(${
1
}
block last_header | jq
".height"
)
if
[
$isPara
==
"1"
]
;
then
if
[
"
$isPara
"
==
"1"
]
;
then
${
1
}
para blocks
-s
$new_height
-e
$new_height
${
1
}
para blocks
-s
"
$new_height
"
-e
"
$new_height
"
new_height
=
$(${
1
}
para blocks
-s
$new_height
-e
$new_height
| jq
".items[0].mainHeight"
)
new_height
=
$(${
1
}
para blocks
-s
"
$new_height
"
-e
"
$new_height
"
| jq
".items[0].mainHeight"
)
fi
fi
if
[
"
${
new_height
}
"
-ge
"
${
expect
}
"
]
;
then
if
[
"
${
new_height
}
"
-ge
"
${
expect
}
"
]
;
then
break
break
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment