Commit Graph

  • 6657818f35
    Merge pull request #1579 from pi-hole/dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.1 development-v6 yubiuser 2024-05-11 14:30:28 +0200
  • 8eb20a7c64
    Merge pull request #1580 from pi-hole/dependabot/github_actions/dev/eps1lon/actions-label-merge-conflict-3.0.1 dev yubiuser 2024-05-11 14:27:01 +0200
  • c17f6bf671
    Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1 dependabot[bot] 2024-05-11 10:27:57 +0000
  • 05c305b4af
    Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1 dependabot[bot] 2024-05-11 10:18:26 +0000
  • d2e46f3cec
    Merge pull request #1576 from pi-hole/fix/grep-version Adam Warner 2024-05-09 08:42:57 +0100
  • a49600e63d
    Install grep to avoid issues in pihole -w/b with the default busybox grep Adam Warner 2024-05-08 21:50:33 +0100
  • 7253da15bd
    Merge pull request #1575 from pi-hole/dependabot/pip/test/dev/pytest-8.2.0 yubiuser 2024-05-04 13:11:38 +0200
  • 51f126108f
    Bump pytest from 8.1.2 to 8.2.0 in /test dependabot[bot] 2024-05-04 10:58:00 +0000
  • 2ad89055a6
    Merge pull request #1574 from pi-hole/dependabot/pip/test/dev/pytest-xdist-3.6.1 yubiuser 2024-05-04 12:57:06 +0200
  • 6990b09aa5
    Bump pytest-xdist from 3.5.0 to 3.6.1 in /test dependabot[bot] 2024-05-04 10:32:42 +0000
  • a0a24306d9
    Merge pull request #1559 from pi-hole/dependabot/github_actions/dev/eps1lon/actions-label-merge-conflict-3.0.0 Adam Warner 2024-04-28 15:36:33 +0100
  • 007dc8018f
    Merge pull request #1556 from pi-hole/dependabot/github_actions/dev/Chizkiyahu/delete-untagged-ghcr-action-4 Adam Warner 2024-04-28 15:36:23 +0100
  • c2887aeffe
    Merge pull request #1567 from pi-hole/dependabot/pip/test/pip-150d523057 master 2024.05.0 Adam Warner 2024-04-28 15:36:02 +0100
  • 4b9a8cabf6
    Merge pull request #1572 from pi-hole/dependabot/pip/test/dev/black-24.4.2 yubiuser 2024-04-27 12:52:36 +0200
  • 94cb08a972
    Bump black from 24.4.0 to 24.4.2 in /test dependabot[bot] 2024-04-27 10:50:34 +0000
  • 0b0db714a4
    Merge pull request #1571 from pi-hole/dependabot/pip/test/dev/pytest-8.1.2 yubiuser 2024-04-27 12:49:33 +0200
  • 0d64bb5665
    Bump pytest from 8.1.1 to 8.1.2 in /test dependabot[bot] 2024-04-27 10:16:10 +0000
  • 9973fd9bf8
    Merge pull request #1569 from lemondjeff/development-v6-issue-1562-take2 Adam Warner 2024-04-21 14:22:30 +0100
  • e239b1cae6 Remove obsolete "version" value from example docker-compose.yml in README.md and from examples/docker-compose-caddy-proxy.yml since "Compose doesn't use version to select an exact schema to validate the Compose file, but prefers the most recent schema when it's implemented." Jeff Miller 2024-04-19 16:29:58 -0700
  • 0215004b1f
    Merge branch 'development-v6' into development-v6-issue-1562 lemondjeff 2024-04-20 15:47:37 -0700
  • 6fcc5e5bad
    Merge branch 'development-v6' into development-v6-issue-1562 lemondjeff 2024-04-20 15:47:03 -0700
  • 36c4118bc4 Remove obsolete "version" value from example docker-compose.yml in README.md and from examples/docker-compose-caddy-proxy.yml since "Compose doesn't use version to select an exact schema to validate the Compose file, but prefers the most recent schema when it's implemented." Jeff Miller 2024-04-19 16:29:58 -0700
  • 7e5ab408ca
    Merge pull request #1563 from lemondjeff/dev Adam Warner 2024-04-20 16:31:49 +0100
  • b033a18a24 Remove obsolete "version" value from example docker-compose.yml in README.md and from .yml files in examples since "Compose doesn't use version to select an exact schema to validate the Compose file, but prefers the most recent schema when it's implemented." Jeff Miller 2024-04-01 16:07:03 -0700
  • 0fd3ae682a
    Merge pull request #1554 from pi-hole/dependabot/pip/test/dev/pytest-8.1.1 Adam Warner 2024-04-18 19:56:27 +0100
  • 2783e38030
    Bump pytest from 8.0.2 to 8.1.1 in /test dependabot[bot] 2024-04-18 18:54:26 +0000
  • 897baa69f0
    Merge pull request #1558 from pi-hole/dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.0 Adam Warner 2024-04-18 19:53:32 +0100
  • 2cfebe2cdf
    Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0 dependabot[bot] 2024-04-18 17:04:40 +0000
  • 4d68ee6af6
    Merge pull request #1557 from shamoon/patch-1 Adam Warner 2024-04-18 17:59:31 +0100
  • 13a04a7705
    Merge pull request #1566 from pi-hole/dependabot/pip/test/dev/black-24.4.0 Adam Warner 2024-04-18 17:55:51 +0100
  • daf1e568bb
    Bump the pip group across 1 directory with 3 updates dependabot[bot] 2024-04-18 15:45:21 +0000
  • e5e6a2945b
    Bump black from 24.2.0 to 24.4.0 in /test dependabot[bot] 2024-04-13 10:22:16 +0000
  • 4b1693b5f7
    Bump the pip group across 1 directory with 3 updates dependabot[bot] 2024-04-12 04:48:11 +0000
  • db20909579
    Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0 dependabot[bot] 2024-03-30 10:36:19 +0000
  • 1b6469ba74
    Fix: correct dns upstreams variable name shamoon 2024-03-28 11:40:01 -0700
  • 2004ba2515
    Merge pull request #1552 from pi-hole/v6/buildkit-fancyness Adam Warner 2024-03-27 18:52:10 +0000
  • 6c3b1e77bd
    Bump Chizkiyahu/delete-untagged-ghcr-action from 3 to 4 dependabot[bot] 2024-03-23 10:54:36 +0000
  • 042c81f8e0
    Bump black from 24.1.1 to 24.3.0 in /test dependabot[bot] 2024-03-20 18:10:47 +0000
  • 00ed068828
    Bump black from 24.2.0 to 24.3.0 in /test dependabot[bot] 2024-03-16 10:51:57 +0000
  • 292a6b961c
    Update Dockerfile to use a nifty buildkit feature allowing us to either pull FTL from the web, or use a locally built copy. Add a build script for ease of local building (separate from the build-and-test script). Update Readme with build instructions Adam Warner 2024-03-16 01:56:35 +0000
  • cdded14041
    Merge pull request #1551 from pi-hole/v6/basic-tweaks Adam Warner 2024-03-16 01:03:39 +0000
  • 24006c7a00
    Address comments. Adam Warner 2024-03-11 18:14:26 +0000
  • 9fefa11c41
    Tidy up a few things in the readme and code. Adam Warner 2024-03-10 19:29:38 +0000
  • 061251e599
    Merge pull request #1541 from pi-hole/dependabot/pip/test/dev/pytest-testinfra-10.1.0 yubiuser 2024-03-02 13:01:15 +0100
  • 146dc52b0b
    Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test dependabot[bot] 2024-03-02 11:59:23 +0000
  • 2bb820bec9
    Merge pull request #1542 from pi-hole/dependabot/pip/test/dev/black-24.2.0 yubiuser 2024-03-02 12:58:11 +0100
  • 23b3a42b78
    Bump black from 24.1.1 to 24.2.0 in /test dependabot[bot] 2024-03-02 11:51:51 +0000
  • f073ab3145
    Merge pull request #1549 from pi-hole/dependabot/pip/test/dev/pytest-8.0.2 yubiuser 2024-03-02 12:50:57 +0100
  • 02c93b362c
    Bump pytest from 8.0.0 to 8.0.2 in /test dependabot[bot] 2024-03-02 10:11:52 +0000
  • ee53b89aba
    fix readme quickstart guide Diogo Samuel Fernandes 2024-03-01 19:39:27 +0000
  • e3f158318c
    Merge pull request #1545 from pi-hole/master Adam Warner 2024-02-26 22:09:51 +0000
  • f43b44823c
    Bump aiohttp from 3.9.1 to 3.9.2 in /test dependabot[bot] 2024-02-26 21:32:54 +0000
  • 91ff5662c4
    Merge pull request #1544 from pi-hole/dev 2024.03.2 2024.03.1 2024.03.0 2024.02.2 Adam Warner 2024-02-26 21:29:53 +0000
  • d366935670
    Bump pytest from 8.0.0 to 8.0.1 in /test dependabot[bot] 2024-02-17 10:57:36 +0000
  • b9676108e2
    Merge pull request #1535 from pi-hole/dependabot/pip/test/dev/pytest-8.0.0 yubiuser 2024-02-04 16:36:31 +0100
  • e2035c184f
    Bump pytest from 7.4.4 to 8.0.0 in /test dependabot[bot] 2024-02-03 11:46:12 +0000
  • 81268690c9
    Merge pull request #1534 from pi-hole/dependabot/pip/test/dev/black-24.1.1 yubiuser 2024-02-03 12:45:20 +0100
  • 9601db6be2
    Bump black from 24.1.0 to 24.1.1 in /test dependabot[bot] 2024-02-03 10:58:30 +0000
  • c79170f864
    Merge pull request #1528 from pi-hole/master Adam Warner 2024-01-27 15:40:06 +0000
  • 317fb86ba7
    Merge pull request #1532 from pi-hole/dependabot/pip/test/dev/black-24.1.0 yubiuser 2024-01-27 14:35:45 +0100
  • 119ae7331e
    Bump black from 23.12.1 to 24.1.0 in /test dependabot[bot] 2024-01-27 10:57:08 +0000
  • 2cabcc6fd1
    Merge pull request #1529 from pi-hole/builder_fontend Adam Warner 2024-01-12 19:19:07 +0000
  • 24090b227e
    Add dockerfile frontend synatax line Christian König 2024-01-10 13:49:05 +0100
  • b9ca401485
    Update the v6 workflow in the master branch so that the nightly continues to build. Scheduled workflows only work from the master branch 2024.02.1 2024.02.0 Adam Warner 2024-01-09 17:44:46 +0000
  • ae7ea353f7
    Merge pull request #1527 from pi-hole/v6/fix-actions-finally Adam Warner 2024-01-07 21:57:33 +0000
  • d3bb3bdebb
    Simplify build and publish action for v6. No need to have an additional matrix for each registry Remove un-needed action file Adam Warner 2024-01-07 14:36:24 +0000
  • 50b8c6418a
    Merge pull request #1526 from pi-hole/registry_digest Adam Warner 2024-01-07 13:12:58 +0000
  • f4f91f778c
    Consider registry when up/downloading artifacts Christian König 2024-01-06 21:31:41 +0100
  • 0c9e8ee66f
    Merge pull request #1517 from pi-hole/artifacts yubiuser 2024-01-06 13:27:53 +0100
  • 0ba8648dbb
    Use ${{ env.PLATFORM_PAIR }} Christian König 2024-01-06 13:21:32 +0100
  • 232a1fc265
    Merge pull request #1525 from pi-hole/dependabot/pip/test/dev/pytest-7.4.4 yubiuser 2024-01-06 12:27:26 +0100
  • e4a6a8c9c5
    Bump pytest from 7.4.3 to 7.4.4 in /test dependabot[bot] 2024-01-06 10:31:36 +0000
  • d0f321b604
    Simplify up/download Christian König 2024-01-03 22:45:46 +0100
  • 2d9856e10a
    Bump actions/download-artifact from 3 to 4 dependabot[bot] 2023-12-30 10:51:27 +0000
  • 6f36d47e44
    Bump actions/upload-artifact from 3 to 4 dependabot[bot] 2023-12-30 10:51:24 +0000
  • 1a052e8671
    Bump actions/upload-artifact from 3 to 4 dependabot[bot] 2023-12-30 10:40:06 +0000
  • 8052ab5402
    Bump actions/download-artifact from 3 to 4 dependabot[bot] 2023-12-30 10:40:00 +0000
  • 03a037994e
    Adjust workflow to run with artifacts v4 Christian König 2023-12-23 21:52:42 +0100
  • 59abffe75b
    Update artifacts action to v4 Christian König 2023-12-23 21:26:36 +0100
  • 174a39facd
    Merge pull request #1514 from pi-hole/revert-1505-dependabot/github_actions/development-v6/actions/upload-artifact-4 Adam Warner 2023-12-23 16:17:35 +0000
  • 30f5524d81
    Merge pull request #1513 from pi-hole/revert-1506-dependabot/github_actions/development-v6/actions/download-artifact-4 Adam Warner 2023-12-23 16:16:59 +0000
  • 7a918dd648
    Revert "Bump actions/download-artifact from 3 to 4" Adam Warner 2023-12-23 16:16:27 +0000
  • 817013012b
    Revert "Bump actions/upload-artifact from 3 to 4" Adam Warner 2023-12-23 16:16:25 +0000
  • 9518e61cea
    Revert "Bump actions/upload-artifact from 3 to 4" Adam Warner 2023-12-23 16:16:23 +0000
  • b7fea60f18
    Revert "Bump actions/download-artifact from 3 to 4" Adam Warner 2023-12-23 16:16:21 +0000
  • 83e918efb9
    Rebase on development-v6, roll in changes based on comments by @yubiuser v6/hard-fail Adam Warner 2023-12-23 12:47:57 +0000
  • 69807c04e8
    Attempt to download FTL before cloning the other component repos Adam Warner 2023-10-30 22:18:49 +0000
  • 8549432d67
    Fail hard if TARGETPLATFORM does not meet one of the predefined values Adam Warner 2023-10-30 22:12:17 +0000
  • e40ebed3e7
    Merge pull request #1505 from pi-hole/dependabot/github_actions/development-v6/actions/upload-artifact-4 Adam Warner 2023-12-23 12:35:36 +0000
  • 9593fccb4a
    Merge pull request #1504 from pi-hole/dependabot/github_actions/dev/actions/upload-artifact-4 Adam Warner 2023-12-23 12:35:28 +0000
  • 85995a460a
    Bump actions/upload-artifact from 3 to 4 dependabot[bot] 2023-12-23 12:35:13 +0000
  • 1c9d9065f8
    Merge pull request #1506 from pi-hole/dependabot/github_actions/development-v6/actions/download-artifact-4 Adam Warner 2023-12-23 12:34:36 +0000
  • 90d67f8866
    Merge pull request #1503 from pi-hole/dependabot/github_actions/dev/actions/download-artifact-4 Adam Warner 2023-12-23 12:34:08 +0000
  • f400befb85
    Merge pull request #1500 from ADawidowski/enhance_webtheme_validation Adam Warner 2023-12-23 12:30:44 +0000
  • 2d799822b3
    Bump actions/download-artifact from 3 to 4 dependabot[bot] 2023-12-23 12:24:30 +0000
  • 7af4cd87f6
    Merge pull request #1511 from pi-hole/fix/riscv64 Adam Warner 2023-12-23 12:23:52 +0000
  • 3d8f1940e3
    Merge pull request #1512 from pi-hole/dependabot/pip/test/dev/black-23.12.1 yubiuser 2023-12-23 12:23:43 +0100
  • cac2ac4292
    Bump black from 23.12.0 to 23.12.1 in /test dependabot[bot] 2023-12-23 10:33:15 +0000
  • 90e45d7269
    Fix v6 built on riscv Christian König 2023-12-22 19:41:11 +0100
  • a04a8abb9e
    Merge pull request #1497 from pi-hole/alpine3_19 yubiuser 2023-12-22 15:08:33 +0100