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 our dist-git CI #2686

Merged
merged 2 commits into from
Jul 4, 2023
Merged

Fix our dist-git CI #2686

merged 2 commits into from
Jul 4, 2023

Conversation

nikromen
Copy link
Member

@nikromen nikromen commented Apr 24, 2023

this PR is an attempt to shut down our CI problems with pyrpkg

dist-git: refresh pyrpkg.Commands after import_srpm commit - WDYT? this shouldn't be a problem for us from the efficiency side

after merging this, don't forget to merge https://pagure.io/fedora-infra/ansible/pull-request/1386

Fixes #2608
Fixes #2317

# pyrpkg to implement, we can refresh the Commands class after every
# import - even if it is not elegant
# note: if https://pagure.io/rpkg/issue/690 is resolved, you may delete this
commands = _load_command(opts, reponame, repo_dir)
Copy link
Member

Choose a reason for hiding this comment

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

@onosek do you think this change makes sense?

Copy link
Member

Choose a reason for hiding this comment

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

Ping @onosek :-) seems like we could rather fix the library. Can you give us guidance?

Copy link

Choose a reason for hiding this comment

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

I prepared a fix that potentially solves the issue:
https://bodhi.fedoraproject.org/updates/?search=rpkg-1.66-8

@praiskup
Copy link
Member

Should we have a particular versioned Require: on python3-rpkg? Or is this going to work with both old and new versions?

in case of importing, the content of directory in `reponame`
changes. To update the state of `Commands` class isn't an easy
process - look how much logic pyrpkg.cli.cliClient.load_cmd has
and the logic is written for context in cliClient, not for Commands
which we are using. Considering this wouldn't be an easy task for
pyrpkg to implement, we can refresh the Commands class after every
import - even if it is not elegant
Related: fedora-copr#2317

pyrpkg don't allow using pre-generated SRPM by default.
They created for this `allow_pre_generated_srpm` for us in
1.66-6 version of rpkg.
@FrostyX FrostyX merged commit 90578dc into fedora-copr:main Jul 4, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

copr-dist-git fails to build on rawhide dist-git - avoid the downstream-only hacks we are using for autospec
4 participants