Skip to content

Commit

Permalink
Merge pull request #10109 from Icinga/gha21310
Browse files Browse the repository at this point in the history
Update GitHub actions
  • Loading branch information
yhabteab authored Sep 3, 2024
2 parents 37e4d7c + 8c02210 commit bf24477
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 13 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/linux.bash
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -exo pipefail

export PATH="/usr/lib/ccache:/usr/lib64/ccache:/opt/rh/devtoolset-11/root/usr/bin:$PATH"
export PATH="/usr/lib/ccache:/usr/lib64/ccache:$PATH"
export CCACHE_DIR=/icinga2/ccache
export CTEST_OUTPUT_ON_FAILURE=1
CMAKE_OPTS=''
Expand Down Expand Up @@ -33,16 +33,6 @@ case "$DISTRO" in
{boost,libedit,mariadb1\*,ncurses,openssl,postgresql,systemd}-devel
;;

centos:*)
yum install -y centos-release-scl epel-release
yum install -y bison ccache cmake3 devtoolset-11-gcc-c++ flex ninja-build \
{boost169,libedit,mariadb,ncurses,openssl,postgresql,systemd}-devel

ln -vs /usr/bin/cmake3 /usr/local/bin/cmake
ln -vs /usr/bin/ccache /usr/lib64/ccache/g++
CMAKE_OPTS='-DBOOST_INCLUDEDIR=/usr/include/boost169 -DBOOST_LIBRARYDIR=/usr/lib64/boost169'
;;

debian:*|ubuntu:*)
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-{recommends,suggests} -y bison \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
distro:
- amazonlinux:2
- amazonlinux:2023
- centos:7 # and RHEL 7
- debian:11 # and Raspbian 11
- debian:12 # and Raspbian 12
- fedora:37
Expand All @@ -33,6 +32,7 @@ jobs:
- opensuse/leap:15.3 # SLES 15.3
- opensuse/leap:15.4 # and SLES 15.4
- opensuse/leap:15.5 # and SLES 15.5
- opensuse/leap:15.6 # and SLES 15.6
- rockylinux:8 # RHEL 8
- rockylinux:9 # RHEL 9
- ubuntu:20.04
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Alexander Fuhr <[email protected]>
Alexander Schomburg <[email protected]>
Alexander Stoll <[email protected]>
Alexander Wirt <[email protected]>
Alvar Penning <[email protected]>
Andrea Avancini <[email protected]>
Andrea Kao <[email protected]>
Andreas Maus <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion tools/win32/test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if (-not ($env:PATH -contains $env:CMAKE_PATH)) {

cd "$env:ICINGA2_BUILDPATH"

ctest.exe -C "${env:CMAKE_BUILD_TYPE}" -T test -O $env:ICINGA2_BUILDPATH/Test.xml --output-on-failure --log_level=all
ctest.exe -C "${env:CMAKE_BUILD_TYPE}" -T test -O $env:ICINGA2_BUILDPATH/Test.xml --output-on-failure
if ($lastexitcode -ne 0) {
cd ..
exit $lastexitcode
Expand Down

0 comments on commit bf24477

Please sign in to comment.