Commit Graph

142 Commits

Author SHA1 Message Date
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] 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
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
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] 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 234dd6c849
Drop the /v8 from `linux/arm64/v8`
1f6a1a438c/cli/command/manifest/util.go (L34)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-30 21:51:29 +00: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
dependabot[bot] e4a46df21a
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-09-16 13:16:45 +00:00
dependabot[bot] aa44c5a44b
Bump docker/setup-qemu-action from 2 to 3
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2 to 3.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](https://github.com/docker/setup-qemu-action/compare/v2...v3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-16 10:35:24 +00:00
dependabot[bot] 9ee27ed2f8
Bump actions/checkout from 3 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-09 10:09:31 +00:00
Adam Warner 6b5332be47
- Change test dockerfile base to alpine, too (Alpine all the things!)
- Tweak build-and-test.sh to allow tests to run against more platforms using buildx
- Split GHA out into two seperate files. One for tests on pull requests, another for build and merge on push to `development-v6` (add other branches in later)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-24 18:11:33 +01:00
dependabot[bot] 52f098c269
Bump docker/build-push-action from 3 to 4
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4)

---
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-07-12 20:48:11 +00:00
dependabot[bot] e3c9b90c6d
Bump actions/stale from 7.0.0 to 8.0.0
Bumps [actions/stale](https://github.com/actions/stale) from 7.0.0 to 8.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/v7...v8.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-07-12 20:35:45 +00:00
Adam Warner da1d135eea
remove erroneous push
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-12 21:34:55 +01:00
Adam Warner e20f1a707a
and push-by-digest
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-12 19:47:37 +01:00
Adam Warner f739dca323
Don't log in or push on pull request
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-12 19:30:23 +01:00
Adam Warner d3c343a01f
Remove the old build process
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-10 23:48:18 +01:00
Adam Warner ef03be0d36
Helps if we replace _all_ references
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-10 23:32:10 +01:00
Adam Warner b44c052b9b
Target `development-v6` instead of `v6-alpine-play`
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-10 23:23:25 +01:00
Adam Warner cc3789df21
Attempt to reduce code reuse in action
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-03 22:01:44 +01:00
Adam Warner 56e2db6cff
Too many actions with the same name..
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-03 20:30:10 +01:00
Adam Warner 67fc0a4a98
Tidy up action a little, add in missing GHCR meta
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-03 20:23:45 +01:00
Adam Warner 38bd86202b
Clarify output of action
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-03 19:15:36 +01:00
Adam Warner 2e5998175b
Yolo
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-06-19 22:44:22 +01:00
Adam Warner 05466f9c14
Lets not overwite an existing image...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-06-19 21:40:13 +01:00
Adam Warner 452e0ca072
Add some arch detection into the dockerfile.
This seems to build locally, lets see what GHA does with it

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-06-19 21:39:24 +01:00
dependabot[bot] 8fb0344f4c
Bump docker/build-push-action from 3 to 4
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4)

---
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-02-04 10:00:30 +00:00
Adam Warner e6df02c637
Disable provenence per https://github.com/docker/buildx/issues/1513#issuecomment-1398340039
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-21 12:39:54 +00:00
Adam Warner a00410a4ae
Merge pull request #1265 from pi-hole/action_close_stale_pr
Add action to close stale PR
2023-01-15 17:44:44 +00:00
Adam Warner 94a6ed33c5
Add a workflow to build v6-pre-alpha container nightly/on push to that branch 2023-01-14 16:40:43 +00:00
RD WebDesign 0fc9505643 More detailed comments
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-01-06 18:48:55 -03:00
RD WebDesign 2771a17148 Add action to close stale PR
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-01-06 18:48:55 -03:00
Adam Warner 67d00f3b38
Merge pull request #1267 from pi-hole/master
Sync master back into development
2023-01-03 19:46:50 +00:00
dependabot[bot] 62e3af4e60
Bump actions/stale from 6 to 7
Bumps [actions/stale](https://github.com/actions/stale) from 6 to 7.
- [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/v6...v7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-24 10:00:34 +00:00
Christian König a4b5122e3e
Shorten no merge conflict message
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-22 22:29:09 +01:00
Adam Warner 842f4eb6c2
Merge pull request #1255 from yubiuser/merge_conflict
Add merge conflict workflow
2022-12-19 20:48:52 +00:00
Christian König e734f1fbce
Add merge conflict workflow
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-15 21:54:27 +01:00
Christian König 6ed70c21a0
Use github cli to sync master back to development
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-15 21:46:58 +01:00