From 398ba9ec935698f548ecf4a3a57d3d7e5cd9ee01 Mon Sep 17 00:00:00 2001 From: Bostjan Skufca Jese Date: Thu, 24 Oct 2024 20:52:24 +0000 Subject: [PATCH 1/2] ci/packaging: Deprecate openSUSE 15.4, add 15.6 --- .github/workflows/build-qa-os-matrix-large.yml | 2 +- .github/workflows/build-qa-os-matrix-small.yml | 2 +- .github/workflows/install-qa-os-matrix.yml | 2 +- .github/workflows/packaging-qa-os-matrix-large.yml | 2 +- .github/workflows/publish-native-packages.yml | 2 +- .../workflows/release-qa-os-matrix-install-from-repo.yml | 2 +- .../release-qa-os-matrix-install-from-source.yml | 2 +- doc/install-from-repo.md | 8 ++++---- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-qa-os-matrix-large.yml b/.github/workflows/build-qa-os-matrix-large.yml index 4b16be49..fb1c9adb 100644 --- a/.github/workflows/build-qa-os-matrix-large.yml +++ b/.github/workflows/build-qa-os-matrix-large.yml @@ -58,8 +58,8 @@ jobs: - ciready/debian:bookworm-ci-c - ciready/debian:sid-ci-c - - ciready/opensuse:leap-15.4-ci-c - ciready/opensuse:leap-15.5-ci-c + - ciready/opensuse:leap-15.6-ci-c - ciready/opensuse:tumbleweed-latest-ci-c - ciready/ubuntu:20.04-ci-c diff --git a/.github/workflows/build-qa-os-matrix-small.yml b/.github/workflows/build-qa-os-matrix-small.yml index 9b47a45f..56fac572 100644 --- a/.github/workflows/build-qa-os-matrix-small.yml +++ b/.github/workflows/build-qa-os-matrix-small.yml @@ -51,7 +51,7 @@ jobs: - ciready/debian:bookworm-ci-c - ciready/debian:sid-ci-c - - ciready/opensuse:leap-15.4-ci-c + - ciready/opensuse:leap-15.6-ci-c - ciready/ubuntu:24.04-ci-c - ciready/ubuntu:rolling-ci-c diff --git a/.github/workflows/install-qa-os-matrix.yml b/.github/workflows/install-qa-os-matrix.yml index 8a1f11bf..16258f00 100644 --- a/.github/workflows/install-qa-os-matrix.yml +++ b/.github/workflows/install-qa-os-matrix.yml @@ -52,8 +52,8 @@ jobs: - debian:bookworm - debian:sid - - opensuse/leap:15.4 - opensuse/leap:15.5 + - opensuse/leap:15.6 - opensuse/tumbleweed:latest - ubuntu:20.04 diff --git a/.github/workflows/packaging-qa-os-matrix-large.yml b/.github/workflows/packaging-qa-os-matrix-large.yml index aad5cf73..90af9300 100644 --- a/.github/workflows/packaging-qa-os-matrix-large.yml +++ b/.github/workflows/packaging-qa-os-matrix-large.yml @@ -58,8 +58,8 @@ jobs: - ciready/debian:bullseye-ci-c - ciready/debian:bookworm-ci-c - - ciready/opensuse:leap-15.4-ci-c - ciready/opensuse:leap-15.5-ci-c + - ciready/opensuse:leap-15.6-ci-c - ciready/ubuntu:20.04-ci-c - ciready/ubuntu:22.04-ci-c diff --git a/.github/workflows/publish-native-packages.yml b/.github/workflows/publish-native-packages.yml index ef6782eb..3d21503f 100644 --- a/.github/workflows/publish-native-packages.yml +++ b/.github/workflows/publish-native-packages.yml @@ -44,8 +44,8 @@ jobs: - ciready/debian:bullseye-ci-c - ciready/debian:bookworm-ci-c - - ciready/opensuse:leap-15.4-ci-c - ciready/opensuse:leap-15.5-ci-c + - ciready/opensuse:leap-15.6-ci-c - ciready/ubuntu:20.04-ci-c - ciready/ubuntu:22.04-ci-c diff --git a/.github/workflows/release-qa-os-matrix-install-from-repo.yml b/.github/workflows/release-qa-os-matrix-install-from-repo.yml index 1ab34f13..9f38bf64 100644 --- a/.github/workflows/release-qa-os-matrix-install-from-repo.yml +++ b/.github/workflows/release-qa-os-matrix-install-from-repo.yml @@ -51,8 +51,8 @@ jobs: - debian:bullseye - debian:bookworm - - opensuse/leap:15.4 - opensuse/leap:15.5 + - opensuse/leap:15.6 - ubuntu:20.04 - ubuntu:22.04 diff --git a/.github/workflows/release-qa-os-matrix-install-from-source.yml b/.github/workflows/release-qa-os-matrix-install-from-source.yml index 779c7151..3af4d30c 100644 --- a/.github/workflows/release-qa-os-matrix-install-from-source.yml +++ b/.github/workflows/release-qa-os-matrix-install-from-source.yml @@ -44,8 +44,8 @@ jobs: - debian:bookworm - debian:sid - - opensuse/leap:15.4 - opensuse/leap:15.5 + - opensuse/leap:15.6 - opensuse/tumbleweed:latest - ubuntu:20.04 diff --git a/doc/install-from-repo.md b/doc/install-from-repo.md index dc567f92..ac08a039 100644 --- a/doc/install-from-repo.md +++ b/doc/install-from-repo.md @@ -146,19 +146,19 @@ apt install snoopy List of supported openSUSE Leap versions [here](https://github.com/a2o/snoopy-packages/tree/master/repo/opensuse-leap). -openSUSE Leap 15.5 [search-key:opensuse-leap-15.5]: +openSUSE Leap 15.6 [search-key:opensuse-leap-15.6]: ```shell curl -o snoopy-packages-key.pub https://a2o.github.io/snoopy-packages/snoopy-packages-key.pub && rpm --import snoopy-packages-key.pub && -zypper addrepo -n "Snoopy Upstream Stable Repository" -g -e https://a2o.github.io/snoopy-packages/repo/opensuse-leap/15.5/stable/ snoopy-stable && +zypper addrepo -n "Snoopy Upstream Stable Repository" -g -e https://a2o.github.io/snoopy-packages/repo/opensuse-leap/15.6/stable/ snoopy-stable && zypper install snoopy ``` -openSUSE Leap 15.4 [search-key:opensuse-leap-15.4]: +openSUSE Leap 15.5 [search-key:opensuse-leap-15.5]: ```shell curl -o snoopy-packages-key.pub https://a2o.github.io/snoopy-packages/snoopy-packages-key.pub && rpm --import snoopy-packages-key.pub && -zypper addrepo -n "Snoopy Upstream Stable Repository" -g -e https://a2o.github.io/snoopy-packages/repo/opensuse-leap/15.4/stable/ snoopy-stable && +zypper addrepo -n "Snoopy Upstream Stable Repository" -g -e https://a2o.github.io/snoopy-packages/repo/opensuse-leap/15.5/stable/ snoopy-stable && zypper install snoopy ``` From a4ffa52b1ea0dc1c30b4c0e7cbe588adc6b18e66 Mon Sep 17 00:00:00 2001 From: Bostjan Skufca Jese Date: Thu, 24 Oct 2024 20:57:11 +0000 Subject: [PATCH 2/2] packaging: Add `openssh-clients` installation for openSUSE This is needed to upload a generated Zypper package from Actions into public package repo. --- dev-tools/install-packaging-software.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/install-packaging-software.sh b/dev-tools/install-packaging-software.sh index a93235dd..15e49423 100755 --- a/dev-tools/install-packaging-software.sh +++ b/dev-tools/install-packaging-software.sh @@ -31,10 +31,10 @@ BOOTSTRAP_GIT_REPO_REQUIRED="false" ### Definitions # - PACKAGE_NAMES_ARCH="pacman openssh" + PACKAGE_NAMES_ARCH="pacman openssh" PACKAGE_NAMES_DEBIAN="debhelper apt-utils gnupg" PACKAGE_NAMES_REDHAT="rpm-build createrepo rpm-sign gnupg2" - PACKAGE_NAMES_SUSE="rpm-build createrepo_c gpg2" + PACKAGE_NAMES_SUSE="rpm-build createrepo_c gpg2 openssh-clients"