Adam Warner
f47b8ede5a
v6.4.3 ( #6618 )
Check for merge conflicts / main (push) Has been cancelled
Sync Back to Development / Syncing branches (push) Has been cancelled
2026-07-06 21:34:28 +01:00
Adam Warner
e4770a4ee2
avoid copytruncate in logrotate ( #6642 )
2026-07-06 20:30:38 +01:00
darkexplosiveqwx
ef91b80f55
notify if logrotate file is out of date
...
Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
2026-07-06 21:22:39 +02:00
darkexplosiveqwx
cd29a71d89
avoid copytruncate in logrotate
...
Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
2026-07-06 21:19:21 +02:00
Adam Warner
18002bf7c6
Merge commit from fork
...
Move logrotate file to /etc/logrotate.d/pihole
2026-07-06 19:41:49 +01:00
Adam Warner
d8625e2912
Merge commit from fork
...
Fix gravity suffix handling
2026-07-06 19:40:43 +01:00
Adam Warner
8e61c8335d
Update gravity.sh
...
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2026-07-06 18:30:21 +01:00
Adam Warner
244d40de99
Update gravity.sh
...
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2026-07-06 18:30:02 +01:00
yubiuser
32ded0390c
Bump trufflesecurity/trufflehog from 3.95.6 to 3.95.8 in the github-actions-dependencies group across 1 directory ( #6660 )
Check for merge conflicts / main (push) Waiting to run
2026-07-05 20:41:30 +02:00
dependabot[bot]
a92736b69a
Bump trufflesecurity/trufflehog
...
Bumps the github-actions-dependencies group with 1 update in the / directory: [trufflesecurity/trufflehog](https://github.com/trufflesecurity/trufflehog ).
Updates `trufflesecurity/trufflehog` from 3.95.6 to 3.95.8
- [Release notes](https://github.com/trufflesecurity/trufflehog/releases )
- [Commits](30d5bb91af...00155c9dc5
2026-07-05 18:31:41 +00:00
Adam Warner
5a84e0427f
Fix BATS gravity test on curl version >=8.21 ( #6661 )
2026-07-05 19:28:45 +01:00
Christian König
31d5e7d575
Compare version strings semantically
...
Signed-off-by: Christian König <github@yubiuser.dev>
2026-07-04 12:48:07 +02:00
Christian König
20ed2ab95f
Fix BATS gravity test on curl version >=8.21
...
Signed-off-by: Christian König <github@yubiuser.dev>
2026-07-04 12:23:02 +02:00
Adam Warner
aac48b75ed
installer: fix custom DNS entry when only one upstream server is provided ( #6638 )
Check for merge conflicts / main (push) Has been cancelled
2026-06-25 22:46:58 +01:00
Austin Gilmour
57b86b69a2
fix(dns): support N upstream DNS servers in custom DNS setup
...
Replace PIHOLE_DNS_1/PIHOLE_DNS_2 numbered variables with a bash array
PIHOLE_DNS=() throughout basic-install.sh. This naturally supports one
or more upstream DNS entries without duplicating a single entry into
both slots when no comma is present in the input.
- User input is split on commas into the array; empty entries skipped
- Invalid entries are filtered out; valid ones retained
- Confirmation dialog joins array elements so it reflects exactly what
was entered
- Preset DNS selection populates the array from the semicolon-delimited
preset string, adding a second element only when one is present
Closes #4783 .
Signed-off-by: Austin Gilmour <gilmoursa@gmail.com>
2026-06-21 10:14:37 -04:00
yubiuser
730e5cd3f0
Bump the github-actions-dependencies group with 2 updates ( #6655 )
Check for merge conflicts / main (push) Has been cancelled
2026-06-20 14:03:59 +02:00
dependabot[bot]
7f18a03e2c
Bump the github-actions-dependencies group with 2 updates
...
Bumps the github-actions-dependencies group with 2 updates: [actions/checkout](https://github.com/actions/checkout ) and [trufflesecurity/trufflehog](https://github.com/trufflesecurity/trufflehog ).
Updates `actions/checkout` from 6.0.3 to 7.0.0
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](df4cb1c069...9c091bb21bhttps://github.com/trufflesecurity/trufflehog/releases )
- [Commits](d411fff7b8...30d5bb91af
2026-06-20 10:02:30 +00:00
Adam Warner
841976c59b
Include alpine 3.24 in tests ( #6654 )
Check for merge conflicts / main (push) Has been cancelled
2026-06-14 21:46:34 +01:00
Christian König
cdb990ad23
Include alpine 3.24 in tests
...
Signed-off-by: Christian König <github@yubiuser.dev>
2026-06-10 20:30:07 +02:00
Adam Warner
23c3b4a648
fix: check return codes in gravity_build_tree and database_recovery() ( #6630 )
Check for merge conflicts / main (push) Has been cancelled
2026-06-08 21:27:14 +01:00
yubiuser
cc63b1088d
Bump the github-actions-dependencies group with 2 updates ( #6651 )
Check for merge conflicts / main (push) Has been cancelled
2026-06-06 12:11:08 +02:00
dependabot[bot]
4bf69d42b0
Bump the github-actions-dependencies group with 2 updates
...
Bumps the github-actions-dependencies group with 2 updates: [actions/checkout](https://github.com/actions/checkout ) and [trufflesecurity/trufflehog](https://github.com/trufflesecurity/trufflehog ).
Updates `actions/checkout` from 6.0.2 to 6.0.3
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](de0fac2e45...df4cb1c069https://github.com/trufflesecurity/trufflehog/releases )
- [Commits](37b77001d0...d411fff7b8
2026-06-06 10:02:38 +00:00
yubiuser
e8b6b4b807
Set BATS pretty output flag depending on the terminal and improve failure output ( #6644 )
2026-06-01 20:16:58 +02:00
yubiuser
062a4651dd
Bump eps1lon/actions-label-merge-conflict from 3.0.3 to 3.1.0 in the github-actions-dependencies group ( #6645 )
2026-06-01 19:39:29 +02:00
Christian König
fa1de50068
Use bats_helper also in newly added gravity tests
...
Signed-off-by: Christian König <github@yubiuser.dev>
2026-06-01 19:31:55 +02:00
Christian König
8a90c77ff2
Fix shellcheck wrning
...
Signed-off-by: Christian König <github@yubiuser.dev>
2026-06-01 19:30:57 +02:00
Christian König
c5949aaa8f
Move on_failure_hook to helper file
...
Signed-off-by: Christian König <github@yubiuser.dev>
2026-06-01 19:30:57 +02:00
Christian König
c66159302f
Use on_failure hook to improve failure output
...
Signed-off-by: Christian König <github@yubiuser.dev>
2026-06-01 19:30:57 +02:00
Christian König
400b3abc26
Set BATS pretty output flag depending on the terminal
...
Signed-off-by: yubiuser <github@yubiuser.dev>
2026-06-01 19:30:57 +02:00
yubiuser
3b0aad0db2
Add gravity tests ( #6639 )
2026-05-30 14:31:33 +02:00
dependabot[bot]
1c1855c7f0
Bump eps1lon/actions-label-merge-conflict
...
Bumps the github-actions-dependencies group with 1 update: [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict ).
Updates `eps1lon/actions-label-merge-conflict` from 3.0.3 to 3.1.0
- [Release notes](https://github.com/eps1lon/actions-label-merge-conflict/releases )
- [Changelog](https://github.com/eps1lon/actions-label-merge-conflict/blob/main/CHANGELOG.md )
- [Commits](1df065ebe6...0273be72a0
2026-05-30 10:02:22 +00:00
Christian König
04e92b2e13
Remove obsolet ph-non-domains removal step
...
Signed-off-by: Christian König <github@yubiuser.dev>
2026-05-28 09:12:53 +02:00
Christian König
be2f724d3a
Use --suffix for mktemp operations. We now install coreutils on all OS so the option should be available. Partly reverts https://github.com/pi-hole/pi-hole/pull/5272
...
Signed-off-by: Christian König <github@yubiuser.dev>
2026-05-28 09:12:17 +02:00
Christian König
2671ebc2b8
Ubuntu 20 curl version does not support etag-compare and etag-save on the same file, so the target will always be downloaded and no 304 is returned
...
Signed-off-by: Christian König <github@yubiuser.dev>
2026-05-25 21:40:35 +02:00
yubiuser
5198095e12
Bump actions/stale from 10.2.0 to 10.3.0 in the github-actions-dependencies group ( #6640 )
2026-05-24 07:51:44 +02:00
dependabot[bot]
c9f932ab48
Bump actions/stale in the github-actions-dependencies group
...
Bumps the github-actions-dependencies group with 1 update: [actions/stale](https://github.com/actions/stale ).
Updates `actions/stale` from 10.2.0 to 10.3.0
- [Release notes](https://github.com/actions/stale/releases )
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md )
- [Commits](b5d41d4e1d...eb5cf3af3a
2026-05-23 10:02:24 +00:00
Adam Warner
a50b35b1a5
Add Fedora 44 and Ubuntu 26.04 LTS to tests ( #6623 )
2026-05-22 22:37:34 +01:00
Christian König
43840b250d
Account for curl version < 7.75
...
Signed-off-by: yubiuser <github@yubiuser.dev>
2026-05-21 23:44:47 +02:00
Christian König
a8de5788c6
Be more generous regarding curl's error output
...
Signed-off-by: Christian König <github@yubiuser.dev>
2026-05-21 23:25:14 +02:00
Christian König
227689f491
Adjust tests to recent changes from https://github.com/pi-hole/pi-hole/pull/6430 and https://github.com/pi-hole/pi-hole/pull/6607 and https://github.com/pi-hole/pi-hole/pull/6605
...
Signed-off-by: Christian König <github@yubiuser.dev>
2026-05-21 23:16:38 +02:00
Christian König
164a0c134a
Fix shellcheck
...
Signed-off-by: Christian König <github@yubiuser.dev>
2026-05-21 22:43:41 +02:00
darkexplosiveqwx
d01a893721
replace tox with BATS for new OSes
...
Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
2026-05-21 22:29:28 +02:00
darkexplosiveqwx
af4df3fa75
Merge branch 'development' into april-os
2026-05-21 22:24:50 +02:00
Christian König
de7cb639d5
Add gravity tests
...
Co-authored-by: Copilot <copilot@github.com>
Signed-off-by: Christian König <github@yubiuser.dev>
2026-05-21 22:22:53 +02:00
Adam Warner
bca84e7125
Replace pytest/tox with direct in-container BATS ( #6598 )
2026-05-21 19:33:31 +01:00
Adam Warner
86562b5eba
Remove spurious runUnattended=true from install test
...
Move from setup/teardown steps to explicit cleanup in each test that creates a "mess"
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2026-05-21 19:30:20 +01:00
Adam Warner
3468c0c418
test: update README for BATS runner usage
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2026-05-21 19:30:20 +01:00
Adam Warner
e972c758ab
test: split containers, simplify run_suite, improve distro error
...
Split the BATS suite into two containers: one for mock/function tests
and one for the fresh install, so installer tests can mutate the
filesystem freely without teardown.
Replace mocks.bash with bats-mock and bats-file, baked into the test
images at build time via Docker ARG-versioned git clones.
Improve the invalid-distro error to list available distros rather than
printing an opaque Dockerfile path.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2026-05-21 19:30:20 +01:00
Adam Warner
551b6516d1
test: bake BATS libraries into test images at build time
...
Add ARG declarations and a build-time RUN step to all Dockerfiles so
bats-core, bats-support, bats-assert, bats-mock, and bats-file are cloned
at image build time rather than at container runtime. Library versions are
defined once in run.sh and passed down via --build-arg
Add .dockerignore to exclude any locally-cached test/libs/ directory from
the build context, preventing 'destination already exists' failures when
the directory exists from a previous local test run.
Remove the legacy commented-out sed stub command from all Dockerfiles
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2026-05-21 19:30:20 +01:00
Adam Warner
356afe66c5
test: restore executable bit on installer FTL bats file
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2026-05-21 19:30:20 +01:00
