Skip to content

Commit e3e34c0

Browse files
committed
try another fix
1 parent 0b04fc6 commit e3e34c0

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ on:
1010

1111
jobs:
1212
build:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-24.04
1414
timeout-minutes: 60
15-
container:
16-
image: debian:trixie
1715
steps:
1816
- uses: actions/checkout@v4
1917
- name: Set up Python 3.11

mycodo/scripts/upgrade_commands.sh

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,6 @@ case "${1:-''}" in
436436
;;
437437
'update-influxdb-2')
438438
printf "\n#### Ensuring compatible version of influxdb 2.x is installed ####\n"
439-
apt install -y systemd
440-
441439
if [[ ${UNAME_TYPE} == 'x86_64' || ${MACHINE_TYPE} == 'arm64' ]]; then
442440
INSTALL_ADDRESS="https://dl.influxdata.com/influxdb/releases/"
443441
AMD64_INSTALL_FILE="influxdb2_2.7.8-1_amd64.deb"
@@ -476,11 +474,7 @@ case "${1:-''}" in
476474
dpkg -i "${INSTALL_FILE}"
477475
rm -rf "${INSTALL_FILE}"
478476

479-
if pidof systemd > /dev/null; then
480-
systemctl restart influxd
481-
else
482-
printf "Systemd not running. Skipping service management for influxd.\n"
483-
fi
477+
systemctl restart influxd
484478
else
485479
printf "Correct version of InfluxDB currently installed (v${CORRECT_VERSION_INSTALL}).\n"
486480
fi
@@ -498,11 +492,7 @@ case "${1:-''}" in
498492
dpkg -i "${CLIENT_FILE}"
499493
rm -rf "${CLIENT_FILE}"
500494

501-
if pidof systemd > /dev/null; then
502-
systemctl restart influxd
503-
else
504-
printf "Systemd not running. Skipping service management for influxd.\n"
505-
fi
495+
systemctl restart influxd
506496
else
507497
printf "Correct version of InfluxDB-Client currently installed (v${CORRECT_VERSION_CLI}).\n"
508498
fi

0 commit comments

Comments
 (0)