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

makefile: use the same ginkgo version that is in go.mod #1128

Merged
merged 1 commit into from
Nov 13, 2024
Merged

makefile: use the same ginkgo version that is in go.mod #1128

merged 1 commit into from
Nov 13, 2024

Conversation

akrejcir
Copy link
Collaborator

What this PR does / why we need it:
Use the same ginkgo version in Makefile that is in go.mod.

Release note:

None

@kubevirt-bot kubevirt-bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Nov 13, 2024
@akrejcir
Copy link
Collaborator Author

/cc @0xFelix @ksimon1 @codingben

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Nov 13, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

codingben
codingben reviewed Nov 13, 2024
View reviewed changes
Makefile
@@ -99,7 +99,8 @@ unittest: generate lint fmt vet manifests metrics-rules-test lint-monitoring
build-functests:
go test -c ./tests

GINKGO_VERSION ?= v2.17.1
GOMOD_PATH ?= ./go.mod
GINKGO_VERSION ?= $(shell grep -E '^\s*github\.com/onsi/ginkgo/v[0-9]+' $(GOMOD_PATH) | awk '{print $$2}')
Copy link
Member

Choose a reason for hiding this comment

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

Why it's important to keep it the same ginkgo version? v2 was released 3 yeras ago so likely v3 won't be released anytime soon.

Copy link
Collaborator Author

@akrejcir akrejcir Nov 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

The dependabot updates the version in go.mod but not in Makefile. If this version is older, then running make functest will downgrade back and leave a lot of changes in vendor files.
This is unexpected for user, that make functest will leave many uncommited git changes in the repo.

It's not about the v3 version, but before this PR, in go.mod there is v2.19.0 and in Makefile v2.17.1.

Copy link
Member

Choose a reason for hiding this comment

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

Understood, thanks! :)

codingben
codingben approved these changes Nov 13, 2024
View reviewed changes
Copy link
Member

@codingben codingben left a comment

Choose a reason for hiding this comment

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

/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 13, 2024
0xFelix
0xFelix approved these changes Nov 13, 2024
View reviewed changes
Copy link
Member

@0xFelix 0xFelix left a comment

Choose a reason for hiding this comment

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

Are you going to also update dependabot's config?

/approve

@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 0xFelix

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

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 13, 2024
@kubevirt-bot kubevirt-bot merged commit 567d9f5 into kubevirt:main Nov 13, 2024
12 checks passed
@akrejcir akrejcir deleted the fix-ginkgo-makefile branch November 13, 2024 15:54
@akrejcir
Copy link
Collaborator Author

akrejcir commented Nov 13, 2024 •
edited
Loading

Are you going to also update dependabot's config?

/approve

No, after this PR, dependabot does not need to be changed.
Is there a config option for this use case?

@0xFelix
Copy link
Member

0xFelix commented Nov 14, 2024 •
edited
Loading

ssp-operator/.github/dependabot.yml

Line 11 in 567d9f5

- dependency-name: "github.com/onsi/ginkgo/v2"

I was talking about this ignore. With this being merged, I think we can allow dependabot to update ginkgo now?

@akrejcir
Copy link
Collaborator Author

Good point. I forgot about that config even thought I've added it in PR #911 .
It didn't work anyway. Dependabot last updated ginkgo in #1028 .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codingben codingben codingben approved these changes

@0xFelix 0xFelix 0xFelix approved these changes

@jcanocan jcanocan Awaiting requested review from jcanocan

@lyarwood lyarwood Awaiting requested review from lyarwood

@ksimon1 ksimon1 Awaiting requested review from ksimon1

Assignees

@0xFelix 0xFelix

@codingben codingben

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@akrejcir @kubevirt-bot @0xFelix @codingben