Skip to content

Commit 0189498

Browse files
committed
fix(deps): install ‹rust2rpm› from Fedora
And also install required ‹pip› and ‹rust2rpm› via ‹pip› for the CentOS. Signed-off-by: Matej Focko <mfocko@redhat.com>
1 parent 0022bd3 commit 0189498

File tree

1 file changed

+24
-7
lines changed

1 file changed

+24
-7
lines changed

files/install-rpm-packages.yaml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@
5555
# for python projects using hatch-vcs
5656
- hatch
5757
- python3-hatch-vcs
58-
# for rust2rpm
59-
- python3.11-pip
6058
# for go-vendor-tools
6159
- trivy
6260
- askalono-cli
@@ -70,13 +68,32 @@
7068
name: build
7169
tags:
7270
- basic-image
73-
- name: Install rust2rpm that is not packaged for EL9.
74-
ansible.builtin.pip:
75-
name: git+https://pagure.io/fedora-rust/rust2rpm.git
76-
# cargo2rpm is built for Python 3.11
77-
executable: pip3.11
71+
72+
- name: Install ‹rust2rpm› on CentOS Stream 9
73+
block:
74+
- name: Install ‹pip› of Python 3.11
75+
ansible.builtin.dnf:
76+
name: python3.11-pip
77+
state: present
78+
install_weak_deps: False
79+
- name: Install rust2rpm that is not packaged for EL9.
80+
ansible.builtin.pip:
81+
name: git+https://pagure.io/fedora-rust/rust2rpm.git
82+
# cargo2rpm is built for Python 3.11 (CentOS Stream 9)
83+
executable: pip3.11
84+
tags:
85+
- basic-image
86+
when: ansible_distribution == "CentOS"
87+
88+
- name: Install ‹rust2rpm› on Fedora
89+
ansible.builtin.dnf:
90+
name: rust2rpm
91+
state: present
92+
install_weak_deps: False
7893
tags:
7994
- basic-image
95+
when: ansible_distribution == "Fedora"
96+
8097
- name: Install go-vendor-tools that is not packaged for EL9.
8198
ansible.builtin.pip:
8299
name: go-vendor-tools

0 commit comments

Comments
 (0)