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.

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

Update ginkgo to v2 #2732

Merged

Conversation

perdasilva
Copy link
Collaborator

Signed-off-by: Per Goncalves da Silva pegoncal@redhat.com

Description of the change:
Updates ginkgo to v2

Motivation for the change:
It's about time

Reviewer Checklist

  • Implementation matches the proposed design, or proposal is updated to match implementation
  • Sufficient unit test coverage
  • Sufficient end-to-end test coverage
  • Docs updated or added to /doc
  • Commit messages sensible and descriptive
  • Tests marked as [FLAKE] are truly flaky
  • Tests that remove the [FLAKE] tag are no longer flaky

@openshift-ci
Copy link

openshift-ci bot commented Apr 9, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 9, 2022
@perdasilva perdasilva force-pushed the ginkgo_v2 branch 14 times, most recently from 32a8cb0 to 47082ae Compare April 11, 2022 09:18
@@ -19,6 +19,8 @@ jobs:
- uses: actions/setup-go@v2
with:
go-version: '~1.17'
- run: mkdir -p artifacts
- run: go install github.com/onsi/ginkgo/v2/ginkgo@latest
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Had to install ginkgo v2 cli. Calling via go run github.com/onsi/ginkgo/ginkgo still runs v1.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I think I found a way to execute it similar to before. I had to remove -mod=vendor though

Makefile Outdated
@@ -26,7 +26,7 @@ YQ_INTERNAL := go run $(MOD_FLAGS) ./vendor/github.com/mikefarah/yq/v3/
KUBEBUILDER_ASSETS := $(or $(or $(KUBEBUILDER_ASSETS),$(dir $(shell command -v kubebuilder))),/usr/local/kubebuilder/bin)
export KUBEBUILDER_ASSETS
GO := GO111MODULE=on GOFLAGS="$(MOD_FLAGS)" go
GINKGO := $(GO) run github.com/onsi/ginkgo/ginkgo
GINKGO := ginkgo
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

go run github.com/onsi/ginkgo/ginkgo runs v1. Had to install the v2 cli locally and use that =(

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I think I found a way to execute it similar to before. I had to remove -mod=vendor though

Makefile Outdated Show resolved Hide resolved
Makefile Show resolved Hide resolved
go.mod Show resolved Hide resolved
@perdasilva perdasilva force-pushed the ginkgo_v2 branch 3 times, most recently from a32c472 to ec6cfbb Compare April 14, 2022 16:07
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
@timflannagan
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 14, 2022
@openshift-merge-robot openshift-merge-robot merged commit 6048250 into operator-framework:master Apr 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants