Skip to content

Commit 6daacdd

Browse files
authored
Fix broken image build from #213 (#214)
2 parents 0115d1a + 0189498 commit 6daacdd

File tree

1 file changed

+24
-8
lines changed

1 file changed

+24
-8
lines changed

files/install-rpm-packages.yaml

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
- systemd-devel # https://github.com/Scribery/tlog/pull/274
2929
- libcurl-devel # /
3030
- python3-setuptools_scm # ansible-lint
31-
- python3-zanata-client # for those who use zanata for localization
3231
- rubygems # https://github.com/packit/packit-service/issues/771
3332
# needed for rust-based projects
3433
- rust
@@ -56,8 +55,6 @@
5655
# for python projects using hatch-vcs
5756
- hatch
5857
- python3-hatch-vcs
59-
# for rust2rpm
60-
- python3.11-pip
6158
# for go-vendor-tools
6259
- trivy
6360
- askalono-cli
@@ -71,13 +68,32 @@
7168
name: build
7269
tags:
7370
- basic-image
74-
- name: Install rust2rpm that is not packaged for EL9.
75-
ansible.builtin.pip:
76-
name: git+https://pagure.io/fedora-rust/rust2rpm.git
77-
# cargo2rpm is built for Python 3.11
78-
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
7993
tags:
8094
- basic-image
95+
when: ansible_distribution == "Fedora"
96+
8197
- name: Install go-vendor-tools that is not packaged for EL9.
8298
ansible.builtin.pip:
8399
name: go-vendor-tools

0 commit comments

Comments
 (0)