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

📖 Add task to update link checker base branch #9208

Conversation

killianmuldoon
Copy link
Contributor

Add a task to update the base branch in our PR markdown link checking action when creating a new release branch.

/area release

@k8s-ci-robot k8s-ci-robot added area/release Issues or PRs related to releasing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 16, 2023
Copy link
Contributor Author

@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.

@kubernetes-sigs/cluster-api-release-team

Not sure if this should be added to the checklist of tasks.

Signed-off-by: killianmuldoon <kmuldoon@vmware.com>
@killianmuldoon
Copy link
Contributor Author

We need to do something similar on CAPV - and change the base_branch listed in the older branches.

@sbueringer
Copy link
Member

sbueringer commented Aug 16, 2023

/lgtm
/approve

/hold

Change is fine for now. Would be good if this action could auto-discover the base branch. (or simply look at the delta in the PR). But this can be a follow-up. Feel free to unhold

@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 Aug 16, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 16, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: d42739f883da2f6c779a4dce4301e96f0fb6490c

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 Aug 16, 2023
@killianmuldoon
Copy link
Contributor Author

/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 Aug 16, 2023
@k8s-ci-robot k8s-ci-robot merged commit 48ae58e into kubernetes-sigs:main Aug 16, 2023
15 of 16 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.6 milestone Aug 16, 2023
@killianmuldoon
Copy link
Contributor Author

Doesn't look like the capability exists for this action: https://github.com/gaurav-nelson/github-action-markdown-link-check#check-only-modified-files-in-a-pull-request

We could disable the PR link checker entirely for older branches as it's not really that useful there, but that's as much work as updating the branch and requires a bit of explanation besides.

@sbueringer
Copy link
Member

Alright. Thx for looking it up. Then let's go with manually updating the branch

@sbueringer
Copy link
Member

sbueringer commented Aug 16, 2023

Thank you very much for taking care of this!

Please follow-up with the same for CAPV.

@sbueringer
Copy link
Member

/cherry-pick release-1.5

@sbueringer
Copy link
Member

/cherry-pick release-1.4

@k8s-infra-cherrypick-robot

@sbueringer: #9208 failed to apply on top of branch "release-1.5":

Applying: Add task to update link checker base branch
Using index info to reconstruct a base tree...
M	docs/release/release-tasks.md
Falling back to patching base and 3-way merge...
Auto-merging docs/release/release-tasks.md
CONFLICT (content): Merge conflict in docs/release/release-tasks.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add task to update link checker base branch
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-1.5

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.

@k8s-infra-cherrypick-robot

@sbueringer: #9208 failed to apply on top of branch "release-1.4":

Applying: Add task to update link checker base branch
Using index info to reconstruct a base tree...
M	docs/release/release-tasks.md
Falling back to patching base and 3-way merge...
Auto-merging docs/release/release-tasks.md
CONFLICT (content): Merge conflict in docs/release/release-tasks.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add task to update link checker base branch
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-1.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.

@killianmuldoon
Copy link
Contributor Author

No need to cherry-pick release docs back IMO - I don't think it's worth the effort to keep them in sync.

@sbueringer
Copy link
Member

sbueringer commented Aug 17, 2023

Agree, I tried it for the fix of the broken link.
I asked @mjlshen for manual cherrypicks now

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. area/release Issues or PRs related to releasing 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants