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

Fix version parsing #1977

Merged

Conversation

marquiz
Copy link
Contributor

@marquiz marquiz commented Dec 12, 2024

The fix in a416af5 was not enough by itself and that needs to be applied comprehensively.

The fix in a416af5 was not enough by
itself and that needs to be applied comprehensively.
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 12, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marquiz

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 12, 2024
Copy link

netlify bot commented Dec 12, 2024

Deploy Preview for kubernetes-sigs-nfd ready!

Name Link
🔨 Latest commit 047d031
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-nfd/deploys/675b44a1c99da8000858289a
😎 Deploy Preview https://deploy-preview-1977--kubernetes-sigs-nfd.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@marquiz
Copy link
Contributor Author

marquiz commented Dec 12, 2024

/milestone v0.17
/cherry-pick release-0.16
/assign @ArangoGutierrez @fmuyassarov @TessaIO

@k8s-infra-cherrypick-robot

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

In response to this:

/milestone v0.17
/cherry-pick release-0.16
/assign @ArangoGutierrez @fmuyassarov @TessaIO

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-sigs/prow repository.

@TessaIO
Copy link
Member

TessaIO commented Dec 13, 2024

/lgtm

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

LGTM label has been added.

Git tree hash: 32b685de1cc84563845e335199689ac1fcc879b3

@k8s-ci-robot k8s-ci-robot merged commit 1ecb1c7 into kubernetes-sigs:master Dec 13, 2024
10 checks passed
@k8s-infra-cherrypick-robot

@marquiz: #1977 failed to apply on top of branch "release-0.16":

Applying: Fix version parsing
Using index info to reconstruct a base tree...
M	cmd/nfd-master/main.go
M	cmd/nfd-worker/main.go
M	scripts/github/update-gh-pages.sh
M	scripts/test-infra/test-e2e-presubmit.sh
Falling back to patching base and 3-way merge...
Auto-merging scripts/test-infra/test-e2e-presubmit.sh
CONFLICT (content): Merge conflict in scripts/test-infra/test-e2e-presubmit.sh
Auto-merging scripts/github/update-gh-pages.sh
Auto-merging cmd/nfd-worker/main.go
Auto-merging cmd/nfd-master/main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Fix version parsing

In response to this:

/milestone v0.17
/cherry-pick release-0.16
/assign @ArangoGutierrez @fmuyassarov @TessaIO

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-sigs/prow repository.

@marquiz marquiz deleted the devel/fix-version-parsing branch December 13, 2024 07:50
@marquiz marquiz restored the devel/fix-version-parsing branch December 13, 2024 08:51
@marquiz marquiz deleted the devel/fix-version-parsing branch December 13, 2024 08:52
@marquiz marquiz mentioned this pull request Dec 20, 2024
24 tasks
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. 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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants