diff --git a/.github/workflows/build-install.yaml b/.github/workflows/build-install.yaml index 87444ac0..22fb04f0 100644 --- a/.github/workflows/build-install.yaml +++ b/.github/workflows/build-install.yaml @@ -55,7 +55,7 @@ jobs: zypper --non-interactive install git-lfs rpm-build - name: 'Install packages (Fedora/CentOS)' - if: ${{ startsWith(matrix.container, 'fedora:') || contains(matrix.container, 'centos:') }} + if: ${{ startsWith(matrix.container, 'fedora:') || contains(matrix.container, 'centos:') }} run: | dnf -y makecache dnf -y distro-sync @@ -71,7 +71,7 @@ jobs: zypper --non-interactive install $(rpmspec -q --buildrequires contrib/osc.spec) - name: 'Install build dependencies (Fedora/CentOS)' - if: ${{ startsWith(matrix.container, 'fedora:') || contains(matrix.container, 'centos:') }} + if: ${{ startsWith(matrix.container, 'fedora:') || contains(matrix.container, 'centos:') }} run: | dnf -y builddep contrib/osc.spec @@ -84,6 +84,20 @@ jobs: ./contrib/build_rpm.py --srpm --rpm + - name: 'Install built RPMs (OpenSUSE)' + if: ${{ startsWith(matrix.container, 'opensuse/') }} + run: | + zypper --non-interactive install --force --allow-vendor-change --allow-unsigned-rpm ./contrib/*/*.rpm + + - name: 'Install build RPMs (Fedora/CentOS)' + if: ${{ startsWith(matrix.container, 'fedora:') || contains(matrix.container, 'centos:') }} + run: | + dnf -y install ./contrib/*/*.rpm + + - name: 'Run installed osc' + run: | + osc --help + pip: name: 'pip install test' runs-on: 'ubuntu-latest' @@ -102,3 +116,7 @@ jobs: - name: 'Install osc from pip' run: | pip3 install . + + - name: 'Run installed osc' + run: | + osc --help diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml index 4ab16235..8767ec27 100644 --- a/.github/workflows/unittests.yaml +++ b/.github/workflows/unittests.yaml @@ -60,7 +60,7 @@ jobs: zypper -n install diffstat diffutils python3 python3-cryptography python3-pip python3-rpm python3-setuptools python3-urllib3 - name: 'Install packages (Fedora/CentOS)' - if: ${{ startsWith(matrix.container, 'fedora:') || contains(matrix.container, 'centos:') }} + if: ${{ startsWith(matrix.container, 'fedora:') || contains(matrix.container, 'centos:') }} run: | dnf -y makecache dnf -y distro-sync @@ -68,7 +68,7 @@ jobs: dnf -y install diffstat diffutils python3 python3-cryptography python3-pip python3-rpm python3-setuptools python3-urllib3 - name: 'Install packages (Debian/Ubuntu)' - if: ${{ startsWith(matrix.container, 'debian:') || startsWith(matrix.container, 'ubuntu:') }} + if: ${{ startsWith(matrix.container, 'debian:') || startsWith(matrix.container, 'ubuntu:') }} run: | apt-get -y update apt-get -y upgrade