Commit Graph

202 Commits

Author SHA1 Message Date
dependabot[bot] 7e0c93b03a Bump Chizkiyahu/delete-untagged-ghcr-action from 4 to 5
Bumps [Chizkiyahu/delete-untagged-ghcr-action](https://github.com/chizkiyahu/delete-untagged-ghcr-action) from 4 to 5.
- [Release notes](https://github.com/chizkiyahu/delete-untagged-ghcr-action/releases)
- [Commits](https://github.com/chizkiyahu/delete-untagged-ghcr-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: Chizkiyahu/delete-untagged-ghcr-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-16 10:23:23 +00:00
Adam Warner a796a89d61 Merge branch 'development' into master
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-09-02 22:19:00 +01:00
Adam Warner 4cb3c3a16d Update branch name in sync-back-to-dev workflow
Check for merge conflicts / main (push) Has been cancelled
Sync Back to Development / Syncing branches (push) Has been cancelled
Build Image and Publish / build (3.19, linux/386) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/amd64) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v6) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v7) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm64) (push) Has been cancelled
Build Image and Publish / build (edge, linux/riscv64) (push) Has been cancelled
Mark stale issues / stale_action (push) Has been cancelled
Mark stale issues / remove_stale (push) Has been cancelled
Close stale PR / stale (push) Has been cancelled
Build Image and Publish / merge-and-deploy (push) Has been cancelled
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-09-02 22:18:02 +01:00
Adam Warner bd54136d08 update dependabot.yml to run against development not dev - remove v6 references
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-09-02 22:09:55 +01:00
Adam Warner fa5344e16c remove old build scripts from master (we wont use them again) and bring accross the v6 one so that the nightly image is built using the correct branches
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-09-02 22:05:41 +01:00
Adam Warner 9e39ed34e0 Disbale arm64 testing for the time being
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-09-02 21:55:43 +01:00
Adam Warner 32c57752cf dev branch becomes development
Default the component branches in Dockerfile to be `development` (might change to master after full v6 release)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-09-02 21:46:22 +01:00
Adam Warner 7a33749f4e Set the flavor and tags in the metadata base on the current build yaml for v5 namely:
- schedule = nightly
 - latest = only on tag/publish
 - else branch name (on dev)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-09-02 18:36:20 +01:00
Adam Warner 26d0b85942 Quick rename (makes it easier to find in the required checks list)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-09-02 18:13:20 +01:00
Adam Warner 13798f0987 Merge branch 'dev' into development-v6
Build and Publish (development-v6) / build (3.19, linux/386) (push) Has been cancelled
Build and Publish (development-v6) / build (3.19, linux/amd64) (push) Has been cancelled
Build and Publish (development-v6) / build (3.19, linux/arm/v6) (push) Has been cancelled
Build and Publish (development-v6) / build (3.19, linux/arm/v7) (push) Has been cancelled
Build and Publish (development-v6) / build (3.19, linux/arm64) (push) Has been cancelled
Build and Publish (development-v6) / build (edge, linux/riscv64) (push) Has been cancelled
Check for merge conflicts / main (push) Has been cancelled
Build and Publish (development-v6) / merge-and-deploy (push) Has been cancelled
2024-08-17 22:30:24 +01:00
dependabot[bot] f610db6d0c Bump docker/build-push-action from 5 to 6
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-24 18:08:50 +00:00
Adam Warner 425ecb39b8 Not sure how this ever worked, or why it has suddenly started causing issues if it did work.
Remove trailing `.` from the pytest version in requirements.txt

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-06-22 12:36:51 +01:00
dependabot[bot] 859e71b01e Bump docker/build-push-action from 5 to 6
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-22 10:42:34 +00:00
dependabot[bot] 42fab8748b Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.1 to 3.0.2.
- [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](https://github.com/eps1lon/actions-label-merge-conflict/compare/v3.0.1...v3.0.2)

---
updated-dependencies:
- dependency-name: eps1lon/actions-label-merge-conflict
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-01 10:35:42 +00:00
dependabot[bot] 70f9bfe3f1 Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.1 to 3.0.2.
- [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](https://github.com/eps1lon/actions-label-merge-conflict/compare/v3.0.1...v3.0.2)

---
updated-dependencies:
- dependency-name: eps1lon/actions-label-merge-conflict
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-01 10:26:23 +00:00
dependabot[bot] c17f6bf671 Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.0 to 3.0.1.
- [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](https://github.com/eps1lon/actions-label-merge-conflict/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: eps1lon/actions-label-merge-conflict
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-11 10:27:57 +00:00
dependabot[bot] 05c305b4af Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.0 to 3.0.1.
- [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](https://github.com/eps1lon/actions-label-merge-conflict/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: eps1lon/actions-label-merge-conflict
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-11 10:18:26 +00:00
Adam Warner a0a24306d9 Merge pull request #1559 from pi-hole/dependabot/github_actions/dev/eps1lon/actions-label-merge-conflict-3.0.0
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0
2024-04-28 15:36:33 +01:00
dependabot[bot] 2cfebe2cdf Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 2.1.0 to 3.0.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](https://github.com/eps1lon/actions-label-merge-conflict/compare/v2.1.0...v3.0.0)

---
updated-dependencies:
- dependency-name: eps1lon/actions-label-merge-conflict
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-18 17:04:40 +00:00
dependabot[bot] db20909579 Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 2.1.0 to 3.0.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](https://github.com/eps1lon/actions-label-merge-conflict/compare/v2.1.0...v3.0.0)

---
updated-dependencies:
- dependency-name: eps1lon/actions-label-merge-conflict
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-30 10:36:19 +00:00
dependabot[bot] 6c3b1e77bd Bump Chizkiyahu/delete-untagged-ghcr-action from 3 to 4
Bumps [Chizkiyahu/delete-untagged-ghcr-action](https://github.com/chizkiyahu/delete-untagged-ghcr-action) from 3 to 4.
- [Release notes](https://github.com/chizkiyahu/delete-untagged-ghcr-action/releases)
- [Commits](https://github.com/chizkiyahu/delete-untagged-ghcr-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: Chizkiyahu/delete-untagged-ghcr-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-23 10:54:36 +00:00
Adam Warner c79170f864 Merge pull request #1528 from pi-hole/master
Sync master back into development
2024-01-27 15:40:06 +00:00
Adam Warner 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-01-09 17:44:46 +00:00
Adam Warner d3bb3bdebb Simplify build and publish action for v6. No need to have an additional matrix for each registry
Remove un-needed action file

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-01-07 20:24:09 +00:00
Christian König f4f91f778c Consider registry when up/downloading artifacts
Signed-off-by: Christian König <ckoenig@posteo.de>
2024-01-06 21:31:41 +01:00
Christian König 0ba8648dbb Use ${{ env.PLATFORM_PAIR }}
Signed-off-by: Christian König <ckoenig@posteo.de>
2024-01-06 13:21:32 +01:00
Christian König d0f321b604 Simplify up/download
Signed-off-by: Christian König <ckoenig@posteo.de>
2024-01-03 22:45:46 +01:00
Christian König 03a037994e Adjust workflow to run with artifacts v4
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-23 21:52:42 +01:00
Christian König 59abffe75b Update artifacts action to v4
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-23 21:26:36 +01:00
Adam Warner 174a39facd Merge pull request #1514 from pi-hole/revert-1505-dependabot/github_actions/development-v6/actions/upload-artifact-4
Revert "Bump actions/upload-artifact from 3 to 4"
2023-12-23 16:17:35 +00:00
Adam Warner 9518e61cea Revert "Bump actions/upload-artifact from 3 to 4" 2023-12-23 16:16:23 +00:00
Adam Warner b7fea60f18 Revert "Bump actions/download-artifact from 3 to 4" 2023-12-23 16:16:21 +00:00
dependabot[bot] 85995a460a Bump actions/upload-artifact from 3 to 4
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-23 12:35:13 +00:00
dependabot[bot] 2d799822b3 Bump actions/download-artifact from 3 to 4
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-23 12:24:30 +00:00
Christian König 90e45d7269 Fix v6 built on riscv
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-22 19:41:11 +01:00
dependabot[bot] 88b0a7cd9e Bump actions/stale from 8.0.0 to 9.0.0
Bumps [actions/stale](https://github.com/actions/stale) from 8.0.0 to 9.0.0.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v8.0.0...v9.0.0)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-09 10:37:30 +00:00
dependabot[bot] 8fc242c8b6 Bump actions/stale from 8.0.0 to 9.0.0
Bumps [actions/stale](https://github.com/actions/stale) from 8.0.0 to 9.0.0.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v8.0.0...v9.0.0)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-09 10:36:29 +00:00
Adam Warner c0d11eadf1 Merge pull request #1474 from pi-hole/dependabot/github_actions/dev/Chizkiyahu/delete-untagged-ghcr-action-3
Bump Chizkiyahu/delete-untagged-ghcr-action from 2 to 3
2023-11-03 14:08:44 +00:00
dependabot[bot] 99e690a0c3 Bump Chizkiyahu/delete-untagged-ghcr-action from 2 to 3
Bumps [Chizkiyahu/delete-untagged-ghcr-action](https://github.com/chizkiyahu/delete-untagged-ghcr-action) from 2 to 3.
- [Release notes](https://github.com/chizkiyahu/delete-untagged-ghcr-action/releases)
- [Commits](https://github.com/chizkiyahu/delete-untagged-ghcr-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: Chizkiyahu/delete-untagged-ghcr-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-31 21:14:42 +00:00
Christian König 3ec61dc340 Add pip ecosystem to dependabot
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-31 21:37:20 +01:00
Adam Warner 234dd6c849 Drop the /v8 from linux/arm64/v8
https://github.com/docker/cli/blob/1f6a1a438c4ae426e446f17848114e58072af2bb/cli/command/manifest/util.go#L34

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-30 21:51:29 +00:00
Adam Warner 147eecb8a6 Merge pull request #1455 from pi-hole/dependabot/github_actions/dev/docker/setup-buildx-action-3
Bump docker/setup-buildx-action from 2 to 3
2023-10-16 18:37:04 +01:00
dependabot[bot] 062ce99089 Bump docker/setup-buildx-action from 2 to 3
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-14 10:45:56 +00:00
dependabot[bot] b2798d44b6 Bump docker/login-action from 2 to 3
Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-14 10:45:52 +00:00
Adam Warner 8439628ac0 Merge pull request #1443 from pi-hole/master
Sync master back into development
2023-10-08 13:09:24 +01:00
Adam Warner 832e3e5f60 Update test-and-build-v6.yml
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-08 13:09:10 +01:00
Adam Warner 89518081b3 Update test-and-build-v6.yml
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-06 13:25:26 +01:00
Adam Warner 3f122308fc Add action to clean up untagged (non-multiarch) images from GHCR
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-09-21 01:13:11 +01:00
dependabot[bot] 57957574d2 Bump docker/metadata-action from 4 to 5
Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4 to 5.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md)
- [Commits](https://github.com/docker/metadata-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-16 13:28:14 +00:00
dependabot[bot] 71b8d50c55 Bump docker/build-push-action from 4 to 5
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-16 13:21:39 +00:00