Skip to content

chore: only run CQA analysis for main and future branches, not the older ones where we didn't implement CQA scripts; also checkout build scripts from the PR's base branch, not main, so we get the correct tooling#2063

Merged
Gerry-Forde merged 3 commits intomainfrom
nickboldt-patch-1
Apr 17, 2026
Merged

chore: only run CQA analysis for main and future branches, not the older ones where we didn't implement CQA scripts; also checkout build scripts from the PR's base branch, not main, so we get the correct tooling#2063
Gerry-Forde merged 3 commits intomainfrom
nickboldt-patch-1

Conversation

@nickboldt
Copy link
Copy Markdown
Member

@nickboldt nickboldt commented Apr 15, 2026

  1. Only run CQA analysis for main and future branches, not the older ones where we didn't implement CQA scripts
  2. Checkout trusted build scripts from the PR's base branch, not main, so we get the correct tooling

https://redhat.atlassian.net/browse/RHIDP-12990

IMPORTANT: Do Not Merge - To be merged by Docs Team Only

Version(s):

Issue:

Preview:

@rhdh-bot
Copy link
Copy Markdown
Collaborator

rhdh-bot commented Apr 15, 2026

Updated preview: https://redhat-developer.github.io/red-hat-developers-documentation-rhdh/pr-2063/ @ 4/16/2026, 6:45:23 PM

@nickboldt nickboldt added the Technical review done ⛅ Any procedure has been succesfully tested label Apr 15, 2026
@nickboldt nickboldt requested a review from themr0c April 15, 2026 20:14
Copy link
Copy Markdown
Collaborator

@rhdh-bot rhdh-bot left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm label Apr 15, 2026
@nickboldt nickboldt changed the title chore: only run CQA analysis for main and future branches, not the ol… chore: only run CQA analysis for main and future branches, not the older ones where we didn't implement CQA scripts Apr 16, 2026
@nickboldt
Copy link
Copy Markdown
Member Author

/cherry-pick release-1.8
/cherry-pick release-1.9

@openshift-cherrypick-robot
Copy link
Copy Markdown
Contributor

@nickboldt: once the present PR merges, I will cherry-pick it on top of release-1.8, release-1.9 in new PRs and assign them to you.

Details

In response to this:

/cherry-pick release-1.8
/cherry-pick release-1.9

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.

…o we get the correct tooling

Signed-off-by: Nick Boldt <nboldt@redhat.com>
@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Apr 16, 2026

New changes are detected. LGTM label has been removed.

@openshift-ci openshift-ci bot removed the lgtm label Apr 16, 2026
@nickboldt nickboldt changed the title chore: only run CQA analysis for main and future branches, not the older ones where we didn't implement CQA scripts chore: only run CQA analysis for main and future branches, not the older ones where we didn't implement CQA scripts; also checkout build scripts from the PR's base branch, not main, so we get the correct tooling Apr 16, 2026
Comment thread .github/workflows/content-quality-assessment.yml
Comment thread .github/workflows/pr.yml
Co-authored-by: Gerry-Forde <63045020+Gerry-Forde@users.noreply.github.com>
@sonarqubecloud
Copy link
Copy Markdown

@Gerry-Forde Gerry-Forde merged commit 7cc2664 into main Apr 17, 2026
7 checks passed
@Gerry-Forde Gerry-Forde deleted the nickboldt-patch-1 branch April 17, 2026 09:38
@openshift-cherrypick-robot
Copy link
Copy Markdown
Contributor

@nickboldt: #2063 failed to apply on top of branch "release-1.9":

Applying: chore: only run CQA analysis for main and future branches, not the older ones.
Using index info to reconstruct a base tree...
A	.github/workflows/content-quality-assessment.yml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): .github/workflows/content-quality-assessment.yml deleted in HEAD and modified in chore: only run CQA analysis for main and future branches, not the older ones.. Version chore: only run CQA analysis for main and future branches, not the older ones. of .github/workflows/content-quality-assessment.yml left in tree.
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 set advice.mergeConflict false"
Patch failed at 0001 chore: only run CQA analysis for main and future branches, not the older ones.

Details

In response to this:

/cherry-pick release-1.8
/cherry-pick release-1.9

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.

@openshift-cherrypick-robot
Copy link
Copy Markdown
Contributor

@nickboldt: #2063 failed to apply on top of branch "release-1.8":

Applying: chore: only run CQA analysis for main and future branches, not the older ones.
Using index info to reconstruct a base tree...
A	.github/workflows/content-quality-assessment.yml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): .github/workflows/content-quality-assessment.yml deleted in HEAD and modified in chore: only run CQA analysis for main and future branches, not the older ones.. Version chore: only run CQA analysis for main and future branches, not the older ones. of .github/workflows/content-quality-assessment.yml left in tree.
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 set advice.mergeConflict false"
Patch failed at 0001 chore: only run CQA analysis for main and future branches, not the older ones.

Details

In response to this:

/cherry-pick release-1.8
/cherry-pick release-1.9

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.

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

Labels

Technical review done ⛅ Any procedure has been succesfully tested

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants