Skip to content

Commit 9c3aa81

Browse files
committed
github: update actions to ubuntu 24.04
1 parent 40afb0a commit 9c3aa81

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.ci/prepare_machine.sh

+10-4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ set -ex
44

55
export DEBIAN_FRONTEND="noninteractive"
66
apt-get -y update
7+
8+
apt-get -y update
9+
apt-get -y install apt-transport-https curl
10+
sh -c "echo 'deb [signed-by=/etc/apt/trusted.gpg.d/naemon.asc] http://download.opensuse.org/repositories/home:/naemon:/daily/xUbuntu_$(lsb_release -rs)/ ./' >> /etc/apt/sources.list"
11+
curl -s -o /etc/apt/trusted.gpg.d/naemon.asc "https://build.opensuse.org/projects/home:naemon/signing_keys/download?kind=gpg"
12+
apt-get -y update
13+
714
apt-get -y install \
815
debhelper \
916
lsb-release \
@@ -68,9 +75,6 @@ apt-get -y install \
6875
chromium-browser \
6976
npm \
7077

71-
echo "deb http://labs.consol.de/repo/stable/ubuntu $(lsb_release -cs) main" >> /etc/apt/sources.list
72-
wget -q "http://labs.consol.de/repo/stable/RPM-GPG-KEY" -O - | apt-key add -
73-
apt-get -y update
7478
apt-get -y install naemon-core naemon-livestatus
7579
chsh -s /bin/bash naemon
7680
! grep docker /etc/group >/dev/null || gpasswd -a naemon docker
@@ -80,7 +84,7 @@ touch /etc/naemon/conf.d/thruk_bp_generated.cfg
8084
chmod 666 /etc/naemon/conf.d/thruk_bp_generated.cfg
8185
chmod 777 /var/cache/naemon/checkresults
8286
if [ -e support/thruk_templates.cfg ]; then
83-
ln -sfn $(realpath support/thruk_templates.cfg) /etc/naemon/conf.d/thruk_templates.cfg
87+
install -m 644 support/thruk_templates.cfg /etc/naemon/conf.d/thruk_templates.cfg
8488
else
8589
:
8690
fi
@@ -91,6 +95,8 @@ mysql -e "create database IF NOT EXISTS test;" -uroot -proot
9195

9296
chown -R naemon: .
9397

98+
ln -sfn /usr/bin/chromium-browser /usr/bin/chromium
99+
94100
# free some disk space again
95101
apt-get clean
96102
df -h

.github/workflows/citest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717

1818
jobs:
1919
citest:
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-24.04
2121
steps:
2222
- uses: actions/checkout@v4
2323
- name: perl -V

t/scenarios/citest/citest/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update; \
44
DEBIAN_FRONTEND=noninteractive \

0 commit comments

Comments
 (0)