fix centos and opensuse

bincrafters · Sep 3, 2024 · e1465c2 · e1465c2
1 parent 86a29b9
commit e1465c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -115,19 +115,18 @@ jobs:
         run: |
           case ${{ matrix.distro }} in
             opensuse*)
-              zypper --non-interactive install python3 python3-pipx python3-setuptools python3-wheel tar gzip pkg-config gcc-c++ make
+              zypper --non-interactive install python3 python3-pip python3-setuptools python3-wheel tar gzip pkg-config gcc-c++ make
+              python3 -m pip install --user pipx
               ;;
             debian*)
               apt-get update && apt-get -qq install -y --no-install-recommends pipx python3-setuptools python3-venv pkg-config g++ make
               ;;
             ubuntu*)
               apt-get update && apt-get -qq install -y --no-install-recommends pipx python3-setuptools python3-venv pkg-config g++ make;;
-            quay.io/centos/centos:stream8)
-              yum -y install dnf-plugins-core && yum config-manager --set-enabled powertools && yum install -y python3 python3-pip pkgconf-pkg-config gcc-c++ make
+            quay.io/centos/centos:stream9)
+              yum -y install dnf-plugins-core && yum config-manager --set-enabled crb && yum install -y python3 python3-pip pkgconf-pkg-config gcc-c++ make
               python3 -m pip install --user pipx
               ;;
-            quay.io/centos/centos:stream9)
-              yum -y install dnf-plugins-core && yum config-manager --set-enabled crb && yum install -y python3 pipx pkgconf-pkg-config gcc-c++ make;;
             almalinux:8*)
               yum -y install dnf-plugins-core && yum config-manager --set-enabled powertools && yum install -y epel-release && yum install -y python3 python3-wheel python3-pip pkgconf-pkg-config gcc-c++ make
               python3 -m pip install --user pipx

diff --git a/main.py b/main.py
@@ -125,7 +125,7 @@ async def _add_package(package: str, repo: str, ref: str, pr: str = "0") -> None
         linux = []
         for p in res:
             for distro in ["opensuse/tumbleweed",
-                           # "opensuse/leap", # does not have pipx
+                           "opensuse/leap",
                            "debian:12",
                            "debian:10",
                            "ubuntu:jammy",
@@ -134,8 +134,7 @@ async def _add_package(package: str, repo: str, ref: str, pr: str = "0") -> None
                            "almalinux:9",
                            "archlinux",
                            "fedora",
-                           "quay.io/centos/centos:stream8",
-                           # "quay.io/centos/centos:stream9", # does not have pipx
+                           "quay.io/centos/centos:stream9",
                            ]:
                 config = copy.deepcopy(p)
                 config['distro'] = distro