Skip to content

revert "cockpit/spec: bundle cockpit plugin during rpm build step" - #4778

Draft
croissanne wants to merge 4 commits into
osbuild:mainfrom
croissanne:revert-4773
Draft

revert "cockpit/spec: bundle cockpit plugin during rpm build step"#4778
croissanne wants to merge 4 commits into
osbuild:mainfrom
croissanne:revert-4773

Conversation

@croissanne

@croissanne croissanne commented Aug 21, 2026

Copy link
Copy Markdown
Member
Revert "cockpit/spec: bundle cockpit plugin during rpm build step"

This reverts commit 4e9b5b36af37d45174006cd3bad4b328e510c2d8.

The module http2-client (pulled in by codegen-openapi) has hidden
characters in its license, this fails rpm inspect.

This reverts commit 4e9b5b3.

The module http2-client (pulled in by codegen-openapi) has hidden
characters in its license, this fails rpm inspect.
@croissanne
croissanne requested a review from a team as a code owner August 21, 2026 17:56

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Hey - I've left some high level feedback:

  • The $(RPM_SPEC): $(RPM_SPEC) $(NODE_MODULES_TEST) rule introduces a self-dependency on $(RPM_SPEC), which can cause confusing or non-terminating makes; drop $(RPM_SPEC) from the prerequisites so the rule only depends on $(NODE_MODULES_TEST) (and any other real inputs).
  • The awk invocation in the $(RPM_SPEC) rule embeds $(SUB_NODE_ENV) directly into the script ('{gsub(...); $(SUB_NODE_ENV) gsub(...)}1'), which will likely produce invalid awk syntax at runtime; consider moving the env manipulation outside awk or using a clean awk script without injected shell snippets.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- The `$(RPM_SPEC): $(RPM_SPEC) $(NODE_MODULES_TEST)` rule introduces a self-dependency on `$(RPM_SPEC)`, which can cause confusing or non-terminating makes; drop `$(RPM_SPEC)` from the prerequisites so the rule only depends on `$(NODE_MODULES_TEST)` (and any other real inputs).
- The `awk` invocation in the `$(RPM_SPEC)` rule embeds `$(SUB_NODE_ENV)` directly into the script (`'{gsub(...); $(SUB_NODE_ENV) gsub(...)}1'`), which will likely produce invalid awk syntax at runtime; consider moving the env manipulation outside awk or using a clean awk script without injected shell snippets.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@codecov

codecov Bot commented Aug 21, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 79.23%. Comparing base (cb6a3dd) to head (065a695).
⚠️ Report is 1 commits behind head on main.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4778      +/-   ##
==========================================
+ Coverage   79.14%   79.23%   +0.08%     
==========================================
  Files         265      265              
  Lines        7015     7015              
  Branches     2551     2586      +35     
==========================================
+ Hits         5552     5558       +6     
+ Misses       1368     1359       -9     
- Partials       95       98       +3     
Flag Coverage Δ
playwright 60.55% <ø> (+0.03%) ⬆️
vitest 74.23% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.
see 2 files with indirect coverage changes


Continue to review full report in Codecov by Harness.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5633e58...065a695. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@kingsleyzissou
kingsleyzissou added this pull request to the merge queue Aug 24, 2026
@croissanne
croissanne removed this pull request from the merge queue due to a manual request Aug 24, 2026
@croissanne

Copy link
Copy Markdown
Member Author

Ok so, let's waive it for the current release, since bundling on distro infra with 2 harmless control characters seems like the better choice. And then i'll keep this open, but in draft, and se if it's possible to push the fix through upstream before the next release.

@croissanne
croissanne marked this pull request as draft August 24, 2026 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants