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

🌱 bump golang to 1.20.12 #1510

Merged
merged 1 commit into from
Jan 9, 2024
Merged

🌱 bump golang to 1.20.12 #1510

merged 1 commit into from
Jan 9, 2024

Conversation

tuminoid
Copy link
Member

@tuminoid tuminoid commented Jan 9, 2024

There are some vulnerabilities that are fixed in 1.20.12. They're not affecting us, but scanners nag, so might as well bump.

@tuminoid
bump golang to 1.20.12
4c44821 
There are some vulnerabilities that are fixed in 1.20.12. They're not
affecting us, but scanners nag, so might as well bump.

Signed-off-by: Tuomo Tanskanen <[email protected]>
@metal3-io-bot metal3-io-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 9, 2024
@tuminoid
Copy link
Member Author

tuminoid commented Jan 9, 2024

/test-centos-e2e-integration-main
/test-ubuntu-integration-main

@tuminoid
Copy link
Member Author

tuminoid commented Jan 9, 2024

/test-centos-e2e-integration-main
/test-ubuntu-integration-main

@tuminoid
Copy link
Member Author

tuminoid commented Jan 9, 2024

/test-centos-e2e-integration-main

@tuminoid
Copy link
Member Author

tuminoid commented Jan 9, 2024

/cherry-pick release-0.5
/cherry-pick release-0.4

@metal3-io-bot
Copy link
Contributor

@tuminoid: once the present PR merges, I will cherry-pick it on top of release-0.5 in a new PR and assign it to you.

In response to this:

/cherry-pick release-0.5
/cherry-pick release-0.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

lentzi90
lentzi90 reviewed Jan 9, 2024
View reviewed changes
Copy link
Member

@lentzi90 lentzi90 left a comment

Choose a reason for hiding this comment

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

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 9, 2024
@tuminoid
Copy link
Member Author

tuminoid commented Jan 9, 2024

/test-centos-e2e-integration-main

@tuminoid
Copy link
Member Author

tuminoid commented Jan 9, 2024

/assign @kashifest

@kashifest
Copy link
Member

/approve

@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kashifest

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

@metal3-io-bot metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 9, 2024
@metal3-io-bot metal3-io-bot merged commit 58a68c9 into metal3-io:main Jan 9, 2024
16 checks passed
@metal3-io-bot metal3-io-bot deleted the tuomo/bump-golang branch January 9, 2024 12:15
@metal3-io-bot metal3-io-bot mentioned this pull request Jan 9, 2024
Merged
@metal3-io-bot
Copy link
Contributor

@tuminoid: new pull request created: #1513

In response to this:

/cherry-pick release-0.5
/cherry-pick release-0.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@metal3-io-bot
Copy link
Contributor

@tuminoid: #1510 failed to apply on top of branch "release-0.4":

Applying: bump golang to 1.20.12
Using index info to reconstruct a base tree...
M	Makefile
A	hack/e2e/ensure_go.sh
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): hack/e2e/ensure_go.sh deleted in HEAD and modified in bump golang to 1.20.12. Version bump golang to 1.20.12 of hack/e2e/ensure_go.sh left in tree.
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 bump golang to 1.20.12
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.5
/cherry-pick release-0.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@tuminoid
Copy link
Member Author

tuminoid commented Jan 9, 2024

I'll make manual bump for 0.4

tuminoid added a commit to Nordix/baremetal-operator that referenced this pull request Jan 9, 2024
@tuminoid
bump golang to 1.20.12
2892167 
Manual cherry-pick of metal3-io#1510.

Signed-off-by: Tuomo Tanskanen <[email protected]>
@tuminoid tuminoid mentioned this pull request Jan 9, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lentzi90 lentzi90 lentzi90 left review comments

Assignees

@kashifest kashifest

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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tuminoid @metal3-io-bot @kashifest @lentzi90