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 CI and RuleSet::assignID regressions #628

Merged
merged 8 commits into from
Jun 6, 2024
Merged

Conversation

hartwork
Copy link
Contributor

@hartwork hartwork commented Jun 4, 2024

No description provided.

.. because the build started failing.

Symptom was (with line breaks added):
> /usr/lib/gcc/x86_64-alpine-linux-musl/10.3.1/../../../../x86_64-alpine-linux-musl/bin/ld:
> /usr/lib/gcc/x86_64-alpine-linux-musl/10.3.1/../../../../lib/libqb.so: unknown type [0x13] section `.relr.dyn'
> /usr/lib/gcc/x86_64-alpine-linux-musl/10.3.1/../../../../x86_64-alpine-linux-musl/bin/ld:
> skipping incompatible /usr/lib/gcc/x86_64-alpine-linux-musl/10.3.1/../../../../lib/libqb.so when searching for -lqb

Dependency Bash is no longer installed by default with 3.20,
so it needs installation now.
Commit 3672e9f
changed the return value of `RuleSet::assignID`
from "return x++" to "return ++x" which broke CI
and skipped value 0.  This commits restores the old
behavior.

This approach does not win prices in purity,
elegance or performance, but performance doesn't matter
in that function and you are invited to claim those prices
for yourself if you can prvide a pull request that humans
understand and that fully passes existing CI...
@radosroka
Copy link
Member

@hartwork thank you for fixing this up. I shouldn't merge #600 before CI was fixed. Sorry, my mistake. I won't do that again.

@radosroka radosroka merged commit 3c01ba3 into USBGuard:main Jun 6, 2024
14 checks passed
@hartwork
Copy link
Contributor Author

hartwork commented Jun 6, 2024

Thank you! 🙏

@hartwork hartwork changed the title [please do not squash when merging] Fix CI and RuleSet::assignID regressions Fix CI and RuleSet::assignID regressions Jun 6, 2024
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.

3 participants