summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/monitoring-plugins.spec14
-rw-r--r--.github/os_detect.sh7
-rw-r--r--.github/workflows/test-next.yml2
-rw-r--r--.github/workflows/test.yml2
4 files changed, 9 insertions, 16 deletions
diff --git a/.github/monitoring-plugins.spec b/.github/monitoring-plugins.spec
index 64ee34f2..10799128 100644
--- a/.github/monitoring-plugins.spec
+++ b/.github/monitoring-plugins.spec
@@ -191,7 +191,6 @@ Requires: %{name}-nt
191Requires: %{name}-ntp 191Requires: %{name}-ntp
192Requires: %{name}-ntp_peer 192Requires: %{name}-ntp_peer
193Requires: %{name}-ntp_time 193Requires: %{name}-ntp_time
194Requires: %{name}-nwstat
195Requires: %{name}-oracle 194Requires: %{name}-oracle
196Requires: %{name}-pgsql 195Requires: %{name}-pgsql
197Requires: %{name}-ping 196Requires: %{name}-ping
@@ -702,19 +701,6 @@ Provides check_ntp_time of the Monitoring Plugins.
702 701
703 702
704 703
705# check_nwstat
706%package nwstat
707Summary: Monitoring Plugins - check_nwstat
708Requires: %{name} = %{version}-%{release}
709
710%description nwstat
711Provides check_nwstat of the Monitoring Plugins.
712
713%files nwstat
714%{plugindir}/check_nwstat
715
716
717
718# check_oracle 704# check_oracle
719%package oracle 705%package oracle
720Summary: Monitoring Plugins - check_oracle 706Summary: Monitoring Plugins - check_oracle
diff --git a/.github/os_detect.sh b/.github/os_detect.sh
index ee9c145d..47c762d3 100644
--- a/.github/os_detect.sh
+++ b/.github/os_detect.sh
@@ -1,10 +1,17 @@
1#!/bin/sh -e 1#!/bin/sh -e
2
3. /etc/os-release
4
2# workaround for really bare-bones Archlinux containers: 5# workaround for really bare-bones Archlinux containers:
3if [ -x "$(command -v pacman)" ]; then 6if [ -x "$(command -v pacman)" ]; then
4 pacman --noconfirm -Sy 7 pacman --noconfirm -Sy
5 pacman --noconfirm -S grep gawk sed 8 pacman --noconfirm -S grep gawk sed
6fi 9fi
7 10
11if [ ${ID} == "fedora" -a ${VERSION_ID} -gt 41 ]; then
12 dnf install -y gawk
13fi
14
8os_release_file= 15os_release_file=
9if [ -s "/etc/os-release" ]; then 16if [ -s "/etc/os-release" ]; then
10 os_release_file="/etc/os-release" 17 os_release_file="/etc/os-release"
diff --git a/.github/workflows/test-next.yml b/.github/workflows/test-next.yml
index 81240759..fd59e85d 100644
--- a/.github/workflows/test-next.yml
+++ b/.github/workflows/test-next.yml
@@ -38,7 +38,7 @@ jobs:
38 ${{ matrix.distro }} \ 38 ${{ matrix.distro }} \
39 /bin/sh -c '${{ matrix.prepare }} && \ 39 /bin/sh -c '${{ matrix.prepare }} && \
40 tools/setup && \ 40 tools/setup && \
41 ./configure --enable-libtap --with-ipv6=no && \ 41 ./configure --enable-libtap && \
42 make && \ 42 make && \
43 make test && \ 43 make test && \
44 make dist && \ 44 make dist && \
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 77ca6585..ce0ec547 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
35 ${{ matrix.distro }} \ 35 ${{ matrix.distro }} \
36 /bin/sh -c '${{ matrix.prepare }} && \ 36 /bin/sh -c '${{ matrix.prepare }} && \
37 tools/setup && \ 37 tools/setup && \
38 ./configure --enable-libtap --with-ipv6=no && \ 38 ./configure --enable-libtap && \
39 make && \ 39 make && \
40 make test && \ 40 make test && \
41 make dist && \ 41 make dist && \