Skip to content

Commit

Permalink
Fix broken image build from #213 (#214)
Browse files Browse the repository at this point in the history
  • Loading branch information
mfocko authored Feb 26, 2025
2 parents 0115d1a + 0189498 commit 6daacdd
Showing 1 changed file with 24 additions and 8 deletions.
32 changes: 24 additions & 8 deletions files/install-rpm-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
- systemd-devel # https://github.com/Scribery/tlog/pull/274
- libcurl-devel # /
- python3-setuptools_scm # ansible-lint
- python3-zanata-client # for those who use zanata for localization
- rubygems # https://github.com/packit/packit-service/issues/771
# needed for rust-based projects
- rust
Expand Down Expand Up @@ -56,8 +55,6 @@
# for python projects using hatch-vcs
- hatch
- python3-hatch-vcs
# for rust2rpm
- python3.11-pip
# for go-vendor-tools
- trivy
- askalono-cli
Expand All @@ -71,13 +68,32 @@
name: build
tags:
- basic-image
- name: Install rust2rpm that is not packaged for EL9.
ansible.builtin.pip:
name: git+https://pagure.io/fedora-rust/rust2rpm.git
# cargo2rpm is built for Python 3.11
executable: pip3.11

- name: Install ‹rust2rpm› on CentOS Stream 9
block:
- name: Install ‹pip› of Python 3.11
ansible.builtin.dnf:
name: python3.11-pip
state: present
install_weak_deps: False
- name: Install rust2rpm that is not packaged for EL9.
ansible.builtin.pip:
name: git+https://pagure.io/fedora-rust/rust2rpm.git
# cargo2rpm is built for Python 3.11 (CentOS Stream 9)
executable: pip3.11
tags:
- basic-image
when: ansible_distribution == "CentOS"

- name: Install ‹rust2rpm› on Fedora
ansible.builtin.dnf:
name: rust2rpm
state: present
install_weak_deps: False
tags:
- basic-image
when: ansible_distribution == "Fedora"

- name: Install go-vendor-tools that is not packaged for EL9.
ansible.builtin.pip:
name: go-vendor-tools
Expand Down

0 comments on commit 6daacdd

Please sign in to comment.