Skip to content
This repository has been archived by the owner on Dec 2, 2021. It is now read-only.

Run CI with go 1.13.15 #37

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Run CI with go 1.13.15 #37

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2c5b5a
[FABCE-148] Update fabric dep in integration test
swetharepakula Mar 21, 2021
4ec02be
Run ci with go 1.13.15
swetharepakula Mar 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

name: $(SourceBranchName)-$(Date:yyyyMMdd)$(Rev:.rrr)
trigger:
- master
- main
pr:
- master
- main
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest pulling this out into a spearate pr, but we're probably in a broken state until it gets done.

Add a Comment in the commit message.

Need a follow up issue, for revising the documentation where the default branch name shows up.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like #36 does most of that


variables:
GOPATH: $(Agent.BuildDirectory)/go
Expand Down
1 change: 1 addition & 0 deletions integration/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ var _ = Describe("EndToEnd", func() {
network = nwo.New(helpers.SimpleSoloNetwork(), testDir, client, 30000, components)
network.GenerateConfigTree()
network.Bootstrap()
network.EventuallyTimeout = 2 * time.Minute

networkRunner := network.NetworkGroupRunner()
process = ifrit.Invoke(networkRunner)
Expand Down
1 change: 1 addition & 0 deletions integration/fab3/fab3_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
By("setting up the channel")
network.CreateAndJoinChannel(orderer, channelName)
network.UpdateChannelAnchors(orderer, channelName)
network.EventuallyTimeout = 2 * time.Minute
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bigger timeouts? Things going slower?


By("deploying the chaincode")
chaincode := nwo.Chaincode{
Expand Down
2 changes: 1 addition & 1 deletion integration/fab3/web3_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
. "github.com/onsi/gomega"
)

const Web3EventuallyTimeout = 5 * time.Minute
const Web3EventuallyTimeout = 7 * time.Minute
const Web3EventuallyPollingInterval = 1 * time.Second

var _ = Describe("Web3 Integration", func() {
Expand Down
2 changes: 2 additions & 0 deletions integration/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ replace github.com/go-kit/kit => github.com/go-kit/kit v0.7.0
replace github.com/hyperledger/burrow => github.com/hyperledger/burrow v0.24.4

replace github.com/fsouza/go-dockerclient => github.com/fsouza/go-dockerclient v1.3.0

replace github.com/hyperledger/fabric => github.com/hyperledger/fabric v1.4.4-0.20200211223613-5eaae3a9940d
3 changes: 3 additions & 0 deletions integration/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
github.com/hyperledger/burrow v0.24.4/go.mod h1:rTFvZkaFrD4uLqMmhmB4wBlXNu/MTuwNVAIkYwBp7t4=
github.com/hyperledger/fabric v1.4.0 h1:AiOUXysOwh4BmSLZaNzw6ZocZl0uByekPcc+g3PiXH4=
github.com/hyperledger/fabric v1.4.0/go.mod h1:tGFAOCT696D3rG0Vofd2dyWYLySHlh0aQjf7Q1HAju0=
github.com/hyperledger/fabric v1.4.4-0.20200211223613-5eaae3a9940d h1:bUzlvQfQiZGXCwFMcgg/fZFKmy4YNbcZmPr6XJhqdNU=
github.com/hyperledger/fabric v1.4.4-0.20200211223613-5eaae3a9940d/go.mod h1:tGFAOCT696D3rG0Vofd2dyWYLySHlh0aQjf7Q1HAju0=
github.com/hyperledger/fabric-amcl v0.0.0-20190902191507-f66264322317 h1:7BDH7PcKavbYYdH6Oo1rOAlftTbC4FuzRsvqAldw12w=
github.com/hyperledger/fabric-amcl v0.0.0-20190902191507-f66264322317/go.mod h1:X+DIyUsaTmalOpmpQfIvFZjKHQedrURQ5t4YqquX7lE=
github.com/hyperledger/fabric-lib-go v1.0.0 h1:UL1w7c9LvHZUSkIvHTDGklxFv2kTeva1QI2emOVc324=
Expand Down Expand Up @@ -264,6 +266,7 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/sykesm/zap-logfmt v0.0.2 h1:czSzn+PIXCOAP/4NAIHTTziIKB8201PzoDkKTn+VR/8=
github.com/sykesm/zap-logfmt v0.0.2/go.mod h1:TerDJT124HaO8UTpZ2wJCipJRAKQ9XONM1mzUabIh6M=
github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965 h1:1oFLiOyVl+W7bnBzGhf7BbIv9loSFQcieWWYIjLqcAw=
github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965/go.mod h1:9OrXJhf154huy1nPWmuSrkgjPUtUNhA+Zmy+6AESzuA=
Expand Down
2 changes: 1 addition & 1 deletion integration/vendor/github.com/hyperledger/fabric/bccsp/factory/factory.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion integration/vendor/github.com/hyperledger/fabric/bccsp/pkcs11/pkcs11.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 62 additions & 1 deletion integration/vendor/github.com/hyperledger/fabric/common/crypto/expiration.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 19 additions & 1 deletion integration/vendor/github.com/hyperledger/fabric/common/flogging/core.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion integration/vendor/github.com/hyperledger/fabric/common/flogging/fabenc/encoder.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 21 additions & 4 deletions integration/vendor/github.com/hyperledger/fabric/common/flogging/loggerlevels.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 41 additions & 8 deletions integration/vendor/github.com/hyperledger/fabric/common/flogging/logging.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion integration/vendor/github.com/hyperledger/fabric/common/metadata/metadata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.