Skip to content

Commit

Permalink
Merge pull request #262 from bostjan/refresh-opensuse-versions
Browse files Browse the repository at this point in the history
ci+packaging: Deprecate/remove OpenSUSE version 15.3, add 15.5
  • Loading branch information
bostjan committed Jul 19, 2023
2 parents 879094c + 5b488cc commit a849433
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-qa-os-matrix-large.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ jobs:
- ciready/debian:bookworm-ci-c
- ciready/debian:sid-ci-c

- ciready/opensuse:leap-15.3-ci-c
- ciready/opensuse:leap-15.4-ci-c
- ciready/opensuse:leap-15.5-ci-c
- ciready/opensuse:tumbleweed-latest-ci-c

- ciready/ubuntu:20.04-ci-c
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/install-qa-os-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ jobs:
- debian:bookworm
- debian:sid

- opensuse/leap:15.3
- opensuse/leap:15.4
- opensuse/leap:15.5
- opensuse/tumbleweed:latest

- ubuntu:20.04
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packaging-qa-os-matrix-large.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ jobs:
- ciready/debian:bullseye-ci-c
- ciready/debian:bookworm-ci-c

- ciready/opensuse:leap-15.3-ci-c
- ciready/opensuse:leap-15.4-ci-c
- ciready/opensuse:leap-15.5-ci-c

- ciready/ubuntu:20.04-ci-c
- ciready/ubuntu:22.04-ci-c
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-native-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ jobs:
- ciready/debian:bullseye-ci-c
- ciready/debian:bookworm-ci-c

- ciready/opensuse:leap-15.3-ci-c
- ciready/opensuse:leap-15.4-ci-c
- ciready/opensuse:leap-15.5-ci-c

- ciready/ubuntu:20.04-ci-c
- ciready/ubuntu:22.04-ci-c
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ jobs:
- debian:bullseye
- debian:bookworm

- opensuse/leap:15.3
- opensuse/leap:15.4
- opensuse/leap:15.5

- ubuntu:20.04
- ubuntu:22.04
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ jobs:
- debian:bookworm
- debian:sid

- opensuse/leap:15.3
- opensuse/leap:15.4
- opensuse/leap:15.5
- opensuse/tumbleweed:latest

- ubuntu:20.04
Expand Down
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@

2023-xx-xx - Version 2.5.2
--------------------------
New features:
=============
o Add OpenSUSE 15.5 support.

Deprecations:
=============
o Remove Ubuntu 18.04 support.
o Remove OpenSUSE 15.3 support.



Expand Down
6 changes: 3 additions & 3 deletions dev-tools/build-native-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,12 @@ case "$OS_ID" in
PKG_SNOOPY_VERSION=`echo "$SNOOPY_RELEASE_VERSION" | sed -e 's/-\?rc/~rc/' | sed -e 's/-/_/g'`
PKG_RELEASE_NUMBER="$ARG_PKG_RELEASE_NUMBER"
case "$OS_VERSION" in
"15.3")
PKG_RELEASE_DIST="bp154"
;;
"15.4")
PKG_RELEASE_DIST="bp154"
;;
"15.5")
PKG_RELEASE_DIST="bp155"
;;
*)
_fatalError "Unsuppoterd SUSE version: $OS_VERSION"
;;
Expand Down
8 changes: 4 additions & 4 deletions doc/install-from-repo.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
```

openSUSE Leap 15.3 [search-key:opensuse-leap-15.3]:
openSUSE Leap 15.4 [search-key:opensuse-leap-15.4]:
```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.3/stable/ snoopy-stable &&
zypper addrepo -n "Snoopy Upstream Stable Repository" -g -e https://a2o.github.io/snoopy-packages/repo/opensuse-leap/15.4/stable/ snoopy-stable &&
zypper install snoopy
```

Expand Down

0 comments on commit a849433

Please sign in to comment.