From ce4f2ece93a3188d583df05777b7687d104a3632 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 16 Apr 2025 23:27:15 +0200 Subject: [PATCH] CI: Add openSUSE Leap 16.0 --- .github/workflows/build.yml | 20 ++++++++++---------- dist/unix/strawberry.spec.in | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7446596a1..05dbac909 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - opensuse_version: [ 'tumbleweed', 'leap:15.6' ] + opensuse_version: [ 'tumbleweed', 'leap:15.6', 'leap:16.0' ] container: image: opensuse/${{matrix.opensuse_version}} steps: @@ -27,11 +27,11 @@ jobs: - name: Upgrade packages (Leap) if: matrix.opensuse_version != 'tumbleweed' run: zypper -n --gpg-auto-import-keys up - - name: Install gcc (Tumbleweed) - if: matrix.opensuse_version == 'tumbleweed' + - name: Install gcc + if: matrix.opensuse_version != 'leap:15.6' run: zypper -n --gpg-auto-import-keys in gcc gcc-c++ - - name: Install gcc (Leap) - if: matrix.opensuse_version != 'tumbleweed' + - name: Install gcc (leap:15.6) + if: matrix.opensuse_version == 'leap:15.6' run: zypper -n --gpg-auto-import-keys in gcc14 gcc14-c++ - name: Install packages run: > @@ -83,7 +83,7 @@ jobs: sparsehash-devel rapidjson-devel - name: Install kdsingleapplication-qt6-devel - if: matrix.opensuse_version == 'tumbleweed' + if: matrix.opensuse_version != 'leap:15.6' run: zypper -n --gpg-auto-import-keys in kdsingleapplication-qt6-devel - name: Build and install KDSingleApplication if: matrix.opensuse_version == 'leap:15.6' @@ -115,14 +115,14 @@ jobs: - name: Copy source tarball working-directory: build run: cp strawberry-*.tar.xz /usr/src/packages/SOURCES/ - - name: Build RPM (Tumbleweed) - if: matrix.opensuse_version == 'tumbleweed' + - name: Build RPM + if: matrix.opensuse_version != 'leap:15.6' env: RPM_BUILD_NCPUS: 4 working-directory: build run: rpmbuild -ba strawberry.spec - - name: Build RPM (Leap) - if: matrix.opensuse_version != 'tumbleweed' + - name: Build RPM (leap:15.6) + if: matrix.opensuse_version == 'leap:15.6' env: RPM_BUILD_NCPUS: 4 CC: gcc-14 diff --git a/dist/unix/strawberry.spec.in b/dist/unix/strawberry.spec.in index d315e7dc9..691caa1e9 100644 --- a/dist/unix/strawberry.spec.in +++ b/dist/unix/strawberry.spec.in @@ -102,7 +102,7 @@ Features: - Streaming support for Subsonic-compatible servers - Unofficial streaming support for Tidal and Qobuz -%if 0%{?suse_version} && 0%{?suse_version} <= 1600 +%if 0%{?suse_version} && 0%{?suse_version} < 1600 %debug_package %endif