Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-24 23:23:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add Fedora 41 and remove Fedora 39 from tests (#5813)

Browse source
This commit is contained in:
Dominik 2024-11-16 17:52:18 +01:00 committed by GitHub
commit d2cbe1f712
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View file

@ -68,8 +68,8 @@ jobs:
ubuntu_23, ubuntu_23,
ubuntu_24, ubuntu_24,
centos_9, centos_9,
fedora_39,
fedora_40, fedora_40,
fedora_41,
] ]
env: env:
DISTRO: ${{matrix.distro}} DISTRO: ${{matrix.distro}}

8
automated install/basic-install.sh
View file

@ -1430,7 +1430,7 @@ install_dependent_packages() {
for i in "$@"; do for i in "$@"; do
# For each package, check if it's already installed (and if so, don't add it to the installArray) # For each package, check if it's already installed (and if so, don't add it to the installArray)
printf " %b Checking for %s..." "${INFO}" "${i}" printf " %b Checking for %s..." "${INFO}" "${i}"
if "${PKG_MANAGER}" -q list installed "${i}" &>/dev/null; then if rpm -q "${i}" &>/dev/null; then
printf "%b %b Checking for %s\\n" "${OVER}" "${TICK}" "${i}" printf "%b %b Checking for %s\\n" "${OVER}" "${TICK}" "${i}"
else else
printf "%b %b Checking for %s (will be installed)\\n" "${OVER}" "${INFO}" "${i}" printf "%b %b Checking for %s (will be installed)\\n" "${OVER}" "${INFO}" "${i}"
@ -2270,7 +2270,7 @@ main() {
notify_package_updates_available notify_package_updates_available
# Install packages necessary to perform os_check # Install packages necessary to perform os_check
printf " %b Checking for / installing Required dependencies for OS Check...\\n" "${INFO}" printf " %b Checking for / installing required dependencies for OS Check...\\n" "${INFO}"
install_dependent_packages "${OS_CHECK_COMMON_DEPS[@]}" "${OS_CHECK_DEPS[@]}" install_dependent_packages "${OS_CHECK_COMMON_DEPS[@]}" "${OS_CHECK_DEPS[@]}"
# Check that the installed OS is officially supported - display warning if not # Check that the installed OS is officially supported - display warning if not
@ -2287,7 +2287,7 @@ main() {
fi fi
# Install packages used by this installation script # Install packages used by this installation script
printf " %b Checking for / installing Required dependencies for this install script...\\n" "${INFO}" printf " %b Checking for / installing required dependencies for this install script...\\n" "${INFO}"
install_dependent_packages "${INSTALLER_COMMON_DEPS[@]}" "${INSTALLER_DEPS[@]}" install_dependent_packages "${INSTALLER_COMMON_DEPS[@]}" "${INSTALLER_DEPS[@]}"
# in case of an update # in case of an update
@ -2335,7 +2335,7 @@ main() {
local dep_install_list=("${PIHOLE_COMMON_DEPS[@]}" "${PIHOLE_DEPS[@]}") local dep_install_list=("${PIHOLE_COMMON_DEPS[@]}" "${PIHOLE_DEPS[@]}")
# Install packages used by the actual software # Install packages used by the actual software
printf " %b Checking for / installing Required dependencies for Pi-hole software...\\n" "${INFO}" printf " %b Checking for / installing required dependencies for Pi-hole software...\\n" "${INFO}"
install_dependent_packages "${dep_install_list[@]}" install_dependent_packages "${dep_install_list[@]}"
unset dep_install_list unset dep_install_list

2
test/_fedora_39.Dockerfile → test/_fedora_41.Dockerfile
View file

@ -1,4 +1,4 @@
FROM fedora:39 FROM fedora:41
RUN dnf install -y git initscripts RUN dnf install -y git initscripts
ENV GITDIR=/etc/.pihole ENV GITDIR=/etc/.pihole

2
test/tox.fedora_39.ini → test/tox.fedora_41.ini
View file

@ -6,5 +6,5 @@ allowlist_externals = docker
deps = -rrequirements.txt deps = -rrequirements.txt
setenv = setenv =
COLUMNS=120 COLUMNS=120
commands = docker buildx build --load --progress plain -f _fedora_39.Dockerfile -t pytest_pihole:test_container ../ commands = docker buildx build --load --progress plain -f _fedora_41.Dockerfile -t pytest_pihole:test_container ../
pytest {posargs:-vv -n auto} ./test_any_automated_install.py ./test_any_utils.py ./test_centos_fedora_common_support.py pytest {posargs:-vv -n auto} ./test_any_automated_install.py ./test_any_utils.py ./test_centos_fedora_common_support.py