Skip to content

Commit

Permalink
fix(cd): install config-manager for rhel9 (#10796) (#13926)
Browse files Browse the repository at this point in the history
it's recently removed from t he rockylinux:9 baseimage

* fix(explain_manifest): pipe output of rpm2archive

(cherry picked from commit 60d4bad)
  • Loading branch information
fffonion authored and gszr committed Nov 27, 2024
1 parent 803102a commit a625f3a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ jobs:
if: matrix.package == 'rpm' && matrix.image != ''
run: |
yum groupinstall -y 'Development Tools'
dnf install -y 'dnf-command(config-manager)'
dnf config-manager --set-enabled powertools || true # enable devel packages on rockylinux:8
dnf config-manager --set-enabled crb || true # enable devel packages on rockylinux:9
yum install -y libyaml-devel
Expand Down
6 changes: 4 additions & 2 deletions scripts/explain_manifest/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,12 @@ def gather_files(path: str, image: str):
elif ext == ".rpm":
# rpm2cpio is needed
# rpm2archive ships with rpm2cpio on debians
# https://github.com/rpm-software-management/rpm/commit/37b963fa51d6ad31086a6e345ce6701afda5afff
# rpm2archive has changed the behaviour to extract to stdout if stdout is not tty
code = os.system(
"""
rpm2archive %s && tar -C %s -xf %s.tgz
""" % (path, t.name, path))
rpm2archive %s | tar -C %s -xz
""" % (path, t.name))
elif ext == ".gz":
code = os.system("tar -C %s -xf %s" % (t.name, path))

Expand Down

0 comments on commit a625f3a

Please sign in to comment.