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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

馃尡 Added go directive test #10261

Merged
merged 1 commit into from
Mar 26, 2024
Merged

馃尡 Added go directive test #10261

merged 1 commit into from
Mar 26, 2024

Conversation

AvineshTripathi
Copy link
Contributor

fixes #10258

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-area PR is missing an area label labels Mar 12, 2024
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 12, 2024
@AvineshTripathi
Copy link
Contributor Author

/retest

@fabriziopandini
Copy link
Member

thanks for picking up this task!
lgtm pending fixing the shell-check error

killianmuldoon
killianmuldoon reviewed Mar 13, 2024
View reviewed changes
Makefile Outdated Show resolved Hide resolved
@fabriziopandini fabriziopandini changed the title added go directive test 馃尡 Added go directive test Mar 13, 2024
sbueringer
sbueringer reviewed Mar 15, 2024
View reviewed changes
Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

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

Otherwise lgtm

hack/verify-go-directive.sh Outdated Show resolved Hide resolved
@AvineshTripathi
Copy link
Contributor Author

/retest

@AvineshTripathi
Copy link
Contributor Author

@sbueringer am not sure if my changes are breaking stuff could you confirm

fabriziopandini
fabriziopandini reviewed Mar 18, 2024
View reviewed changes
Makefile Outdated Show resolved Hide resolved
fabriziopandini
fabriziopandini reviewed Mar 18, 2024
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

One nit, otherwise lgtm

@fabriziopandini
Copy link
Member

/test pull-cluster-api-test-main

This seems a flake (there is also a discussion thread in slack)

@fabriziopandini
Copy link
Member

/area ci

@k8s-ci-robot k8s-ci-robot added area/ci Issues or PRs related to ci and removed do-not-merge/needs-area PR is missing an area label labels Mar 19, 2024
@fabriziopandini
Copy link
Member

@AvineshTripathi thanks for working on this!
/lgtm
cc @sbueringer @killianmuldoon for a final pass (otherwise I will merge in a few days)

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 19, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: fe36be89b3c3b477151bc76d50197697b088c8ed

killianmuldoon
killianmuldoon reviewed Mar 20, 2024
View reviewed changes
Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

Thanks @AvineshTripathi!

/lgtm
/approve
/hold

in case someone else want to have another look.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 20, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: killianmuldoon

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 20, 2024
@chrischdi
Copy link
Member

/lgtm

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 26, 2024
@k8s-ci-robot k8s-ci-robot merged commit c916807 into kubernetes-sigs:main Mar 26, 2024
22 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.7 milestone Mar 26, 2024
@sbueringer
Copy link
Member

Would be great if we can manual cherry-pick this PR into 1.6 & 1.5 (in both cases we should use 1.20 as GO_DIRECTIVE_VERSION)

@AvineshTripathi Do you want to take this over?

@AvineshTripathi
Copy link
Contributor Author

Hey sure I can take those up, can you explain bit more "manual cherry-pick this pr into.."

@sbueringer
Copy link
Member

sbueringer commented Mar 26, 2024 •
edited
Loading

Basically you create the same PR against the release-1.6 & release-1.5 branch (but using 1.20 as GO_DIRECTIVE_VERSION). You can either do it entirely manually or something like this:

git checkout release-1.6
git checkout -b release-1.6-go-directive
git cherry-pick <commit of this PR>
# Change GO_DIRECTIVE_VERSION  to 1.20
git commit --amend
...

Just saying "Manually" because usually we have a cherry-pick bot. But this won't be enough as we want to use 1.20

This was referenced Mar 30, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@killianmuldoon killianmuldoon killianmuldoon left review comments

@chrischdi chrischdi Awaiting requested review from chrischdi

@sbueringer sbueringer Awaiting requested review from sbueringer

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

Assignees

@chrischdi chrischdi

@fabriziopandini fabriziopandini

@killianmuldoon killianmuldoon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/ci Issues or PRs related to ci cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.

Add presubmit check to prevent accidental go directive bump
6 participants
@AvineshTripathi @fabriziopandini @k8s-ci-robot @chrischdi @sbueringer @killianmuldoon