Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try to upgrade ginkgo to v2 #3202

Closed
wants to merge 1 commit into from
Closed

Try to upgrade ginkgo to v2 #3202

wants to merge 1 commit into from

Conversation

SamYuan1990
Copy link
Contributor

@SamYuan1990 SamYuan1990 commented Jan 29, 2022 •
edited
Loading

Type of change

  • Improvement (improvement to code, performance, etc)

Description

upgrade ginkgo to v2
upgrade related go files to ginkgo v2

Additional details

ref: https://onsi.github.io/ginkgo/MIGRATING_TO_V2

Related issues

resolve #3184

@SamYuan1990 SamYuan1990 requested a review from a team as a code owner January 29, 2022 10:04
@SamYuan1990 SamYuan1990 marked this pull request as draft January 29, 2022 11:26
@SamYuan1990 SamYuan1990 marked this pull request as ready for review January 29, 2022 13:35
@SamYuan1990
Copy link
Contributor Author

@denyeart , ref to #2954 (comment)
which means for PR related with go mod changes as https://github.com/hyperledger/fabric/pull/3202/files#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6L24
depends on #2707 ?

@SamYuan1990 SamYuan1990 marked this pull request as draft January 29, 2022 14:53
@SamYuan1990 SamYuan1990 changed the title Try to upgrade ginkgo to v2 [WIP]Try to upgrade ginkgo to v2 Jan 29, 2022
@SamYuan1990 SamYuan1990 changed the title [WIP]Try to upgrade ginkgo to v2 Try to upgrade ginkgo to v2 Jan 30, 2022
@SamYuan1990
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Commenter does not have sufficient privileges for PR 3202 in repo hyperledger/fabric

@SamYuan1990 SamYuan1990 marked this pull request as ready for review January 30, 2022 06:19
@SamYuan1990
Copy link
Contributor Author

can someone help with rerun unit test in CI?

@SamYuan1990
by this change make ginkgo following go mod for package management.
00fe686 
upgrade related go files to ginkgo v2
refer: https://onsi.github.io/ginkgo/MIGRATING_TO_V2

Signed-off-by: Sam Yuan <yy19902439@126.com>
@SamYuan1990
Copy link
Contributor Author

Thanks @yacovm , as CI passed, and current go mod changes without protobuf changes.
Can someone help review this PR?

denyeart
denyeart reviewed Feb 4, 2022
View reviewed changes
go.mod
@@ -21,8 +21,9 @@ require (
github.com/frankban/quicktest v1.11.3 // indirect
github.com/fsouza/go-dockerclient v1.7.0
github.com/go-kit/kit v0.9.0
github.com/golang/protobuf v1.3.3
github.com/golang/protobuf v1.5.2
Copy link
Contributor

Choose a reason for hiding this comment

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

@guoger @Param-S I thought etcd required the older protobuf, and therefore we were stuck at the older version of protobuf and ginkgo until the etcd update is complete. Right?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, It is correct. It is recorded here: #2185 (comment).

Copy link
Contributor

Choose a reason for hiding this comment

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

One more issue for reference: https://jira.hyperledger.org/browse/FAB-18363

SamYuan1990
SamYuan1990 commented Feb 7, 2022
View reviewed changes
go.mod
google.golang.org/grpc v1.31.0
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/cheggaaa/pb.v1 v1.0.28
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

replace github.com/onsi/gomega => github.com/onsi/gomega v1.9.0
replace github.com/golang/protobuf => github.com/golang/protobuf v1.3.3
Copy link
Contributor Author

@SamYuan1990 SamYuan1990 Feb 7, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

@Param-S , @denyeart , I am not sure if we can use replace here to make protobuf using version 1.3.3?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yuanyi@yuanyideMacBook-Pro fabric % go mod why github.com/golang/protobuf                          
# github.com/golang/protobuf
(main module does not need package github.com/golang/protobuf)

Copy link
Contributor

Choose a reason for hiding this comment

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

I think you need to wait until the Protobuf update from the other PR is merged.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I see

mastersingh24
mastersingh24 suggested changes Feb 20, 2022
View reviewed changes
Copy link
Contributor

@mastersingh24 mastersingh24 left a comment

Choose a reason for hiding this comment

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

Just blocking this until the protobuf upgrade

@SamYuan1990
Copy link
Contributor Author

Just blocking this until the protobuf upgrade

May I know is there any schedule for protobuf upgrade?

@SamYuan1990
Copy link
Contributor Author

please let me know if this pr is ready for merge/review once I rebased with latest.

@SamYuan1990
Copy link
Contributor Author

Will reopen after etcd one merged. @denyeart

@SamYuan1990 SamYuan1990 closed this Jun 6, 2022
This was referenced Jun 21, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Param-S Param-S Param-S left review comments

@denyeart denyeart denyeart left review comments

@mastersingh24 mastersingh24 mastersingh24 requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

upgrade github.com/onsi/ginkgo to v2
4 participants
@SamYuan1990 @mastersingh24 @Param-S @denyeart