-
Notifications
You must be signed in to change notification settings - Fork 125
Fix spec bconds and cmake options #325
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
Open
dmach
wants to merge
6
commits into
rpm-software-management:main
Choose a base branch
from
dmach:spec-bconds
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e232ca5
spec: Fix --without=man
dmach f401322
spec: Fix --without=dnf5
dmach 07271a3
Fix failing build
dmach 48d25df
GHA: Add test for spec bconds
dmach 6be95d9
cmake: Install README for dnf5 plugins only if WITH_DNF5_PLUGINS is on
dmach 9d9787b
cmake: Add an option for linking with dependencies of static libsolv
dmach File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| name: 'tests' | ||
|
|
||
| on: | ||
| pull_request: | ||
| paths: | ||
| - '.github/workflows/tests.yml' | ||
| - '**.spec' | ||
| - '**CMakeLists.txt' | ||
| - 'contrib/test-spec-bconds.py' | ||
| # allow manual execution from the GitHub web interface | ||
| workflow_dispatch: | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| spec-bconds: | ||
| name: Test rebuilding spec with different --with bconds | ||
| runs-on: ubuntu-latest | ||
| container: | ||
| image: fedora:rawhide | ||
| steps: | ||
| - name: Install packages | ||
| run: | | ||
| dnf -y install ccache dnf-plugins-core git rpm-build | ||
|
|
||
| - name: Create ccache symlinks to prioritize it over gcc | ||
| run: | | ||
| ln -s /usr/bin/ccache /usr/local/bin/gcc | ||
| ln -s /usr/bin/ccache /usr/local/bin/g++ | ||
| ln -s /usr/bin/ccache /usr/local/bin/cc | ||
| ln -s /usr/bin/ccache /usr/local/bin/c++ | ||
|
|
||
| - name: Checkout sources | ||
| run: | | ||
| git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY dnf5-pr | ||
| cd dnf5-pr | ||
| git fetch origin $GITHUB_REF:branch-pr | ||
| git switch branch-pr | ||
|
|
||
| - name: Run tests | ||
| run: | | ||
| cd dnf5-pr/contrib | ||
| ./test-spec-bconds.py |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| #!/usr/bin/python3 | ||
|
|
||
|
|
||
| import os | ||
| import subprocess | ||
| import sys | ||
|
|
||
|
|
||
| FLAGS = { | ||
| "comps": {}, | ||
| "dnf5": { | ||
| "with": ["libdnf-cli"], | ||
| }, | ||
| "dnf5_plugins": {}, | ||
| "dnf5daemon_client": { | ||
| "with": ["libdnf-cli"], | ||
| }, | ||
| "dnf5daemon_server": { | ||
| "with": ["libdnf-cli"], | ||
| }, | ||
| "dnf5daemon_tests": {}, | ||
| "html": {}, | ||
| # "libdnf_cli": {}, | ||
| "modulemd": {}, | ||
| "perl5": {}, | ||
| "plugin_actions": {}, | ||
| "python3": {}, | ||
| "python_plugins_loader": { | ||
| # requires python3 | ||
| "with": ["python3"], | ||
| }, | ||
| "ruby": {}, | ||
| "static_libsolv": {}, | ||
| "zchunk": {}, | ||
| } | ||
|
|
||
|
|
||
| FLAGS_ALWAYS_WITH = [ | ||
| "libdnf_cli", | ||
| "tests", | ||
| ] | ||
|
|
||
|
|
||
| FLAGS_ALWAYS_WITHOUT = [ | ||
| # we don't care about a different compiler now | ||
| "clang", | ||
|
|
||
| # broken option | ||
| "go", | ||
|
|
||
| # man pages require nearly all other options on | ||
| "man", | ||
|
|
||
| # we don't care about performance tests now | ||
| "performance_tests", | ||
|
|
||
| # we don't care about code sanity now | ||
| "sanitizers", | ||
| ] | ||
|
|
||
|
|
||
| TOPDIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) | ||
| SPEC = os.path.abspath(os.path.join(TOPDIR, "dnf5.spec")) | ||
|
|
||
|
|
||
| def get_name_version(): | ||
| cmd = ["rpmspec", "-q", SPEC, "--srpm", "--qf", "%{name}-%{version}"] | ||
| return subprocess.check_output(cmd, encoding="utf-8").strip() | ||
|
|
||
|
|
||
| def git_archive(): | ||
| """ | ||
| Create a tarball named exactly as the tarball from the spec, | ||
| so we don't have to modify the spec at all. | ||
| """ | ||
| nv = get_name_version() | ||
| archive_path = f"{TOPDIR}/{nv}.tar.gz" | ||
| cmd = [ | ||
| "git", "archive", | ||
| "--prefix", f"{nv}/", | ||
| "--output", archive_path, | ||
| "HEAD" | ||
| ] | ||
| subprocess.run(cmd, check=True, cwd=TOPDIR) | ||
| print(f"Created archive {archive_path}") | ||
|
|
||
|
|
||
| def install_build_deps(): | ||
| cmd = ["dnf", "-y", "builddep", SPEC] | ||
|
|
||
| flags = [] | ||
| flags += list(FLAGS) | ||
| flags += list(FLAGS_ALWAYS_WITH) | ||
| for data in FLAGS.values(): | ||
| flags += data.get("with", []) | ||
|
|
||
| for flag in flags: | ||
| cmd += ["--define", f"_with_{flag} 1"] | ||
|
|
||
| subprocess.run(cmd, check=True) | ||
|
|
||
|
|
||
| def build(with_flag): | ||
| data = FLAGS[with_flag] | ||
|
|
||
| cmd = ["rpmbuild", "--ba", SPEC] | ||
| cmd += [ | ||
| # use tarball from git_archive()'s target location | ||
| "--define", f"_sourcedir {TOPDIR}", | ||
| # speedup: disable compression | ||
| "--define", "_source_payload w.ufdio", | ||
| "--define", "_binary_payload w.ufdio", | ||
| # speedup: disable debuginfo | ||
| "--define", "debug_package %{nil}", | ||
| ] | ||
|
|
||
| # enable the current flag | ||
| cmd += ["--with", with_flag] | ||
|
|
||
| # disable the other flags | ||
| for without_flag in FLAGS: | ||
| if without_flag == with_flag: | ||
| continue | ||
|
|
||
| # enable deps instead of disabling | ||
| deps_with = data.get("with", []) | ||
| if without_flag in deps_with: | ||
| cmd += ["--with", without_flag] | ||
| continue | ||
|
|
||
| cmd += ["--without", without_flag] | ||
|
|
||
| # enable the flags that should be always on | ||
| for always_with_flag in FLAGS_ALWAYS_WITH: | ||
| cmd += ["--with", always_with_flag] | ||
|
|
||
| # disable the flags that should be always off | ||
| for always_without_flag in FLAGS_ALWAYS_WITHOUT: | ||
| cmd += ["--without", always_without_flag] | ||
|
|
||
| print(10 * "\n") | ||
| print(f"Building with flag '{with_flag}'...") | ||
| print("Running command:", cmd) | ||
| try: | ||
| subprocess.run(cmd, check=True) | ||
| except subprocess.CalledProcessError: | ||
| print(f"Error: Failed to build with flag '{with_flag}'") | ||
| return False | ||
| return True | ||
|
|
||
|
|
||
| def main(): | ||
| git_archive() | ||
| install_build_deps() | ||
|
|
||
| errors = [] | ||
| for flag in FLAGS: | ||
| success = build(flag) | ||
| if not success: | ||
| errors.append(flag) | ||
|
|
||
| if errors: | ||
| print(10 * "\n") | ||
| print("Error: The following flags failed to build:", errors) | ||
| sys.exit(1) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| main() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be no longer needed, the problem was fixed in glib.