summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorwaja <waja@users.noreply.github.com>2023-06-28 16:39:27 +0200
committerGitHub <noreply@github.com>2023-06-28 16:39:27 +0200
commit265a7c0ed8ccde7868bb7e77c44aecc403743c21 (patch)
tree3a02f6ce03e8f781dcfca22ee1f17817225a0ff9 /.github
parentb96a8424f0ec6206238b650c2c63b4bd006ab43a (diff)
parentb24eb7f46ac8667324efd818c01d68d5a1376c89 (diff)
downloadmonitoring-plugins-265a7c0ed8ccde7868bb7e77c44aecc403743c21.tar.gz
Merge branch 'master' into compiler_warning_part_2
Diffstat (limited to '.github')
-rw-r--r--.github/dependabot.yml1
-rwxr-xr-x.github/prepare_debian.sh19
-rw-r--r--.github/workflows/codeql-analysis.yml61
-rw-r--r--.github/workflows/test.yml2
4 files changed, 46 insertions, 37 deletions
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 282063c4..07073644 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,3 +1,4 @@
1---
1version: 2 2version: 2
2updates: 3updates:
3 - package-ecosystem: github-actions 4 - package-ecosystem: github-actions
diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index 5222659e..7f5592b4 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -5,13 +5,18 @@ set -e
5 5
6export DEBIAN_FRONTEND=noninteractive 6export DEBIAN_FRONTEND=noninteractive
7 7
8sed "s/main/non-free contrib/g" /etc/apt/sources.list.d/debian.sources > /etc/apt/sources.list.d/debian-nonfree.sources 8source /etc/os-release
9apt-get update 9
10apt-get -y install software-properties-common 10if [ ${ID} = "debian" ]; then
11if [ $(lsb_release -is) = "Debian" ]; then 11 if [ -f /etc/apt/sources.list.d/debian.sources ]; then
12 apt-add-repository non-free 12 sed "s/main/non-free contrib/g" /etc/apt/sources.list.d/debian.sources > /etc/apt/sources.list.d/debian-nonfree.sources
13 apt-get update 13 else
14 apt-get update
15 apt-get -y install software-properties-common
16 apt-add-repository non-free
17 fi
14fi 18fi
19apt-get update
15apt-get -y install perl \ 20apt-get -y install perl \
16 autotools-dev \ 21 autotools-dev \
17 libdbi-dev \ 22 libdbi-dev \
@@ -83,7 +88,7 @@ cp tools/squid.conf /etc/squid/squid.conf
83service squid start 88service squid start
84 89
85# mariadb 90# mariadb
86service mariadb start 91service mariadb start || service mysql start
87mysql -e "create database IF NOT EXISTS test;" -uroot 92mysql -e "create database IF NOT EXISTS test;" -uroot
88 93
89# ldap 94# ldap
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ab8bfaae..43b35d31 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,3 +1,4 @@
1---
1# For most projects, this workflow file will not need changing; you simply need 2# For most projects, this workflow file will not need changing; you simply need
2# to commit it to your repository. 3# to commit it to your repository.
3# 4#
@@ -13,10 +14,10 @@ name: "CodeQL"
13 14
14on: 15on:
15 push: 16 push:
16 branches: [ master ] 17 branches: [master]
17 pull_request: 18 pull_request:
18 # The branches below must be a subset of the branches above 19 # The branches below must be a subset of the branches above
19 branches: [ master ] 20 branches: [master]
20 schedule: 21 schedule:
21 - cron: '15 18 * * 0' 22 - cron: '15 18 * * 0'
22 23
@@ -32,41 +33,41 @@ jobs:
32 strategy: 33 strategy:
33 fail-fast: false 34 fail-fast: false
34 matrix: 35 matrix:
35 language: [ 'cpp' ] 36 language: ['cpp']
36 # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] 37 # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
37 # Learn more: 38 # Learn more:
38 # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed 39 # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
39 40
40 steps: 41 steps:
41 - name: Checkout repository 42 - name: Checkout repository
42 uses: actions/checkout@v3 43 uses: actions/checkout@v3
43 44
44 # Initializes the CodeQL tools for scanning. 45 # Initializes the CodeQL tools for scanning.
45 - name: Initialize CodeQL 46 - name: Initialize CodeQL
46 uses: github/codeql-action/init@v2 47 uses: github/codeql-action/init@v2
47 with: 48 with:
48 languages: ${{ matrix.language }} 49 languages: ${{ matrix.language }}
49 # If you wish to specify custom queries, you can do so here or in a config file. 50 # If you wish to specify custom queries, you can do so here or in a config file.
50 # By default, queries listed here will override any specified in a config file. 51 # By default, queries listed here will override any specified in a config file.
51 # Prefix the list here with "+" to use these queries and those in the config file. 52 # Prefix the list here with "+" to use these queries and those in the config file.
52 # queries: ./path/to/local/query, your-org/your-repo/queries@main 53 # queries: ./path/to/local/query, your-org/your-repo/queries@main
53 54
54 - name: Install packages 55 - name: Install packages
55 run: | 56 run: |
56 sudo apt update 57 sudo apt update
57 sudo apt-get install -y --no-install-recommends m4 gettext automake autoconf make build-essential 58 sudo apt-get install -y --no-install-recommends m4 gettext automake autoconf make build-essential
58 sudo apt-get install -y --no-install-recommends perl autotools-dev libdbi-dev libldap2-dev libpq-dev \ 59 sudo apt-get install -y --no-install-recommends perl autotools-dev libdbi-dev libldap2-dev libpq-dev \
59 libmysqlclient-dev libradcli-dev libkrb5-dev libdbi0-dev \ 60 libmysqlclient-dev libradcli-dev libkrb5-dev libdbi0-dev \
60 libdbd-sqlite3 libssl-dev libcurl4-openssl-dev liburiparser-dev 61 libdbd-sqlite3 libssl-dev libcurl4-openssl-dev liburiparser-dev
61 62
62 - name: Configure build 63 - name: Configure build
63 run: | 64 run: |
64 ./tools/setup 65 ./tools/setup
65 ./configure --enable-libtap 66 ./configure --enable-libtap
66 67
67 - name: Build 68 - name: Build
68 run: | 69 run: |
69 make 70 make
70 71
71 - name: Perform CodeQL Analysis 72 - name: Perform CodeQL Analysis
72 uses: github/codeql-action/analyze@v2 73 uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e825eb34..306f21cf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,9 +1,11 @@
1---
1name: Test 2name: Test
2 3
3on: 4on:
4 push: 5 push:
5 branches: 6 branches:
6 - '*' 7 - '*'
8 # Run test for any PRs
7 pull_request: 9 pull_request:
8 10
9jobs: 11jobs: