EVMCC & Fab3 Dependency Split #20
Conversation
swetharepakula
requested review from
christo4ferris,
guoger,
mastersingh24,
MHBauer and
muralisrini
as code owners
swetharepakula
force-pushed
the
restructure
branch
from
84bd902
to
0f65f91
Compare
swetharepakula
changed the title
swetharepakula
force-pushed
the
restructure
branch
2 times, most recently
from
6ed74de
to
72fbb28
Compare
There was a problem hiding this comment.
Some failed merges to resolve. There are files that have conflicts inside, as well as extra files that need to be deleted.
go1.13 finds some gosum hashing issues, but I'm not sure if it's due to the merge or something else
are we excising dep completely? Is it still used for anything?
I need to check on replace directives for modules.
It looks like there's some stuff that doesn't use the same versions as it used to, including using lesser versions now. Probably an artifact of them mostly being v0.x versions.
gotools.mk
Outdated
| @@ -22,19 +22,14 @@ gotools-clean: | |||
| -@rm -rf $(BUILD_DIR)/gotools | |||
|
|
|||
| # Special override for ginkgo since we want to use the version vendored with the project | |||
| gotool.dep: GINKGO_VERSION ?= "v1.10.2" | |||
There was a problem hiding this comment.
gotool.dep? Huh? should match gotool.ginkgo, I think.
There was a problem hiding this comment.
Regarding the version, I feel like we were tied to the version in fabric, previously, so that's pretty cool if it's not anymore.
- since fabric chaincode environments do not support go modules yet, evmcc needs a local vendor directory - this commit one in a series of commits to split the evmcc and fab3 dependencies Signed-off-by: Swetha Repakula <srepaku@us.ibm.com>
swetharepakula
force-pushed
the
restructure
branch
3 times, most recently
from
7b7fbe7
to
f2345c6
Compare
|
|
||
| [[override]] | ||
| name = "github.com/go-kit/kit" | ||
| version = "0.8.0" |
There was a problem hiding this comment.
this being the version of go-kit we had before this change.
scripts/golinter.sh
Outdated
| ) | ||
|
|
||
| for i in "${arr[@]}" | ||
| declare -a goModules=( | ||
| ) |
There was a problem hiding this comment.
this is probably used in a later commit?
scripts/golinter.sh
Outdated
| ) | ||
|
|
||
| declare -a goModules=( | ||
| "./fab3" | ||
| ) |
There was a problem hiding this comment.
Yes, I see it now, 2nd commit.
There was a problem hiding this comment.
yea not the cleanest division of the commits
scripts/golinter.sh
Outdated
| exit 1 | ||
| fi | ||
| done | ||
|
|
There was a problem hiding this comment.
something something shell magic to merge these two arrays and remove the duplication.
needs research, I don't know off the top of my head.
- use go modules for entire repo - Fab3 requires $GO111MODULE to be set to on to run, test, or build as there is no local vendor directory for the module - integration still needs a vendor directory as it uses Fabric repository which has not been converted to modules yet - remove dep make targets - modify scripts to enable go modules when dealing with fab3 Signed-off-by: Swetha Repakula <srepaku@us.ibm.com>
The script is not used anywhere in the repo so remove it Signed-off-by: Swetha Repakula <srepaku@us.ibm.com>
swetharepakula
force-pushed
the
restructure
branch
from
f2345c6
to
bf3fbd5
Compare
|
I didn't delete anything. I thought we turned that off? |
|
No, I don't think we turned that off. |
make basic-checksmake unit-testmake integration-testhttps://jira.hyperledger.org/browse/FAB-17053
https://jira.hyperledger.org/browse/FAB-16919