Skip to content

Commit

Permalink
Merge pull request #10291 from Icinga/gha21310
Browse files Browse the repository at this point in the history
Update GitHub Actions
  • Loading branch information
Al2Klimov authored Jan 14, 2025
2 parents f0dccf7 + 5051bbd commit 696762c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 124 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux.bash
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ case "$DISTRO" in
{libedit,mariadb,ncurses,openssl,postgresql,systemd}-devel

yum install -y bzip2 tar wget
wget https://boostorg.jfrog.io/artifactory/main/release/1.69.0/source/boost_1_69_0.tar.bz2
wget https://archives.boost.io/release/1.69.0/source/boost_1_69_0.tar.bz2
tar -xjf boost_1_69_0.tar.bz2

(
Expand Down Expand Up @@ -44,7 +44,7 @@ case "$DISTRO" in
{boost,libedit,mariadb,ncurses,openssl,postgresql,systemd}-devel
;;

opensuse/*)
*suse*)
zypper in -y bison ccache cmake flex gcc-c++ ninja {lib{edit,mariadb,openssl},ncurses,postgresql,systemd}-devel \
libboost_{context,coroutine,filesystem,iostreams,program_options,regex,system,test,thread}-devel
;;
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@ jobs:
- fedora:40
- fedora:41

# openSUSE Leap is close enough to SLES to test just one of them.
# As openSUSE is much easier to deploy, we test it despite the fact that we don't necessarily
# support individual versions of openSUSE as long as their SLES counterparts.
# I.e., remove any opensuse/leap:* line below only if we stopped packaging both openSUSE and SLES!
- opensuse/leap:15.3
- opensuse/leap:15.4
- opensuse/leap:15.5
- opensuse/leap:15.6

Expand All @@ -47,6 +41,9 @@ jobs:
- rockylinux:8
- rockylinux:9

- registry.suse.com/suse/sle15:15.5
- registry.suse.com/suse/sle15:15.6

- ubuntu:20.04
- ubuntu:22.04
- ubuntu:24.04
Expand Down
116 changes: 0 additions & 116 deletions .github/workflows/rpm.yml

This file was deleted.

0 comments on commit 696762c

Please sign in to comment.