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

🌱 [Monorepo] Fix make verify-crd-compatibility for catalogd #1668

Merged

Conversation

camilamacedo86
Copy link
Contributor

@camilamacedo86 camilamacedo86 commented Jan 30, 2025

To proceed, we needed to skip the check when the previous commit is not found. However, this results in the verify-crd-compatibility check always being skipped for catalogd. Example: https://github.com/operator-framework/operator-controller/actions/runs/13016547026/job/36307072381?pr=1653#step:4:68

Simply reverting the verify-crd-compatibility target and fixing the path to include catalogd will not work because the check must be executed from the root directory; otherwise, it fails to correctly resolve to commit SHAs for comparison.

To address this, we have combined the checks for both CRDs into a single verification step, ensuring correctness while eliminating duplicate file references.

@camilamacedo86 camilamacedo86 requested a review from a team as a code owner January 30, 2025 09:01
Copy link

netlify bot commented Jan 30, 2025

Deploy Preview for olmv1 ready!

Name Link
🔨 Latest commit 7a51015
🔍 Latest deploy log https://app.netlify.com/sites/olmv1/deploys/679b77246f1f3000089e8b7c
😎 Deploy Preview https://deploy-preview-1668--olmv1.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.

@camilamacedo86 camilamacedo86 force-pushed the fix-crd-diff-catalogd branch 3 times, most recently from e19760f to 4d17ca8 Compare January 30, 2025 09:19
@camilamacedo86 camilamacedo86 changed the title 🌱 fix: revert changes in make verify-crd-compatibility to restore catalogd test functionality 🌱 fix(ci): revert changes in make verify-crd-compatibility to restore catalogd test functionality Jan 30, 2025
@camilamacedo86 camilamacedo86 changed the title 🌱 fix(ci): revert changes in make verify-crd-compatibility to restore catalogd test functionality WIP: 🌱 fix(ci): revert changes in make verify-crd-compatibility to restore catalogd test functionality Jan 30, 2025
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 30, 2025
Copy link

codecov bot commented Jan 30, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.35%. Comparing base (158d974) to head (7a51015).
Report is 7 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1668      +/-   ##
==========================================
- Coverage   67.42%   67.35%   -0.07%     
==========================================
  Files          55       55              
  Lines        4632     4644      +12     
==========================================
+ Hits         3123     3128       +5     
- Misses       1284     1291       +7     
  Partials      225      225              
Flag Coverage Δ
e2e 53.37% <ø> (+0.07%) ⬆️
unit 54.28% <ø> (-0.17%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@camilamacedo86 camilamacedo86 force-pushed the fix-crd-diff-catalogd branch 3 times, most recently from c134fc1 to 575a701 Compare January 30, 2025 12:51
The `verify-crd-compatibility` check needs to be executed from the root directory; otherwise, it fails to correctly resolve commit SHAs for comparison.

To address this, we have combined the checks for both CRDs into a single verification step, ensuring correctness while eliminating duplicate file references.
@camilamacedo86 camilamacedo86 changed the title WIP: 🌱 fix(ci): revert changes in make verify-crd-compatibility to restore catalogd test functionality 🌱 [Monorepo] Fix make verify-crd-compatibility for catalogd Jan 30, 2025
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 30, 2025
Copy link
Member

@LalatenduMohanty LalatenduMohanty left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 30, 2025
@LalatenduMohanty LalatenduMohanty added this pull request to the merge queue Jan 30, 2025
Merged via the queue into operator-framework:main with commit c5e9a17 Jan 30, 2025
23 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants