From e1465c2bdc3213458b9772a80fa3d37056bcd08e Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Tue, 3 Sep 2024 10:20:33 +0000 Subject: [PATCH] fix centos and opensuse --- .github/workflows/cron.yml | 9 ++++----- main.py | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 389eeb0..2214c2b 100644 --- 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 index 71e24d1..2a8c1c6 100644 --- 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