diff --git a/.github/workflows/build-install.yaml b/.github/workflows/build-install.yaml index fc6024fa..87444ac0 100644 --- a/.github/workflows/build-install.yaml +++ b/.github/workflows/build-install.yaml @@ -36,7 +36,6 @@ jobs: # OpenSUSE # leap < 15.2 doesn't contain git-lfs which causes actions/checkout to fail - - 'opensuse/leap:15.2' - 'opensuse/leap:15.3' - 'opensuse/leap:15.4' - 'opensuse/tumbleweed' diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml index 93a4a4e7..4ab16235 100644 --- a/.github/workflows/unittests.yaml +++ b/.github/workflows/unittests.yaml @@ -30,9 +30,8 @@ jobs: - 'fedora:36' - 'fedora:rawhide' - # OpenSUSE + # openSUSE # leap < 15.2 doesn't contain git-lfs which causes actions/checkout to fail - - 'opensuse/leap:15.2' - 'opensuse/leap:15.3' - 'opensuse/leap:15.4' - 'opensuse/tumbleweed' @@ -51,13 +50,14 @@ jobs: image: ${{ matrix.container }} steps: - - name: 'Install packages (OpenSUSE)' + - name: 'Install packages (openSUSE)' if: ${{ startsWith(matrix.container, 'opensuse/') }} run: | - zypper --non-interactive --gpg-auto-import-keys refresh - zypper --non-interactive dist-upgrade - zypper --non-interactive install git-lfs - zypper --non-interactive install diffstat diffutils python3 python3-cryptography python3-pip python3-rpm python3-setuptools python3-urllib3 + zypper -n --gpg-auto-import-keys refresh + zypper -n lr --details + grep -qi tumbleweed /etc/os-release && zypper -n dist-upgrade || zypper -n patch || zypper -n patch + zypper -n install git-lfs + 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:') }} @@ -82,12 +82,12 @@ jobs: pip3 install -e . python3 setup.py test - - name: 'Generate coverage reports (OpenSUSE Tumbleweed)' + - name: 'Generate coverage reports (openSUSE Tumbleweed)' if: ${{ matrix.container == 'opensuse/tumbleweed' }} run: | - zypper --non-interactive install python3-pytest python3-pytest-cov + zypper -n install python3-pytest python3-pytest-cov pytest --cov=osc - - name: 'Upload coverage reports to Codecov (OpenSUSE Tumbleweed)' + - name: 'Upload coverage reports to Codecov (openSUSE Tumbleweed)' if: ${{ matrix.container == 'opensuse/tumbleweed' }} uses: codecov/codecov-action@v3