Skip to content

Actions: pi-hole/docker-pi-hole

Actions

Check for merge conflicts

Actions

Loading...

Show workflow options

Create status badge

merge-conflict.yml
685 workflow runs
685 workflow runs
Event

Filter by event
Status

Filter by status
Branch
Actor

Filter by actor
Bump black from 24.1.1 to 24.2.0 in /test Check for merge conflicts #711: Commit 1bf34d1 pushed by dependabot bot
February 17, 2024 10:58 13s dependabot/pip/test/dev/black-24.2.0
dependabot/pip/test/dev/black-24.2.0
February 17, 2024 10:58 13s
Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test Check for merge conflicts #710: Commit 1b52067 pushed by dependabot bot
February 17, 2024 10:58 8s dependabot/pip/test/dev/pytest-testinfra-10.1.0
dependabot/pip/test/dev/pytest-testinfra-10.1.0
February 17, 2024 10:58 8s
Bump pytest from 8.0.0 to 8.0.1 in /test Check for merge conflicts #709: Commit d366935 pushed by dependabot bot
February 17, 2024 10:57 12s dependabot/pip/test/dev/pytest-8.0.1
dependabot/pip/test/dev/pytest-8.0.1
February 17, 2024 10:57 12s
Update the v6 workflow in the master branch so that the nightly conti… Check for merge conflicts #708: Commit b9ca401 pushed by PromoFaux
February 14, 2024 19:17 10s 2024.02.0
2024.02.0
February 14, 2024 19:17 10s
Merge pull request #1535 from pi-hole/dependabot/pip/test/dev/pytest-… Check for merge conflicts #707: Commit b967610 pushed by yubiuser
February 4, 2024 15:36 2m 10s dev
dev
February 4, 2024 15:36 2m 10s
Bump pytest from 7.4.4 to 8.0.0 in /test Check for merge conflicts #706: Pull request #1535 synchronize by dependabot bot
February 3, 2024 11:46 9s
February 3, 2024 11:46 9s
Bump pytest from 7.4.4 to 8.0.0 in /test Check for merge conflicts #705: Commit e2035c1 pushed by dependabot bot
February 3, 2024 11:46 11s dependabot/pip/test/dev/pytest-8.0.0
dependabot/pip/test/dev/pytest-8.0.0
February 3, 2024 11:46 11s
Merge pull request #1534 from pi-hole/dependabot/pip/test/dev/black-2… Check for merge conflicts #704: Commit 8126869 pushed by yubiuser
February 3, 2024 11:45 2m 10s dev
dev
February 3, 2024 11:45 2m 10s
Bump pytest from 7.4.4 to 8.0.0 in /test Check for merge conflicts #703: Commit 4647058 pushed by dependabot bot
February 3, 2024 10:58 9s dependabot/pip/test/dev/pytest-8.0.0
dependabot/pip/test/dev/pytest-8.0.0
February 3, 2024 10:58 9s
Bump black from 24.1.0 to 24.1.1 in /test Check for merge conflicts #702: Commit 9601db6 pushed by dependabot bot
February 3, 2024 10:58 10s dependabot/pip/test/dev/black-24.1.1
dependabot/pip/test/dev/black-24.1.1
February 3, 2024 10:58 10s
Merge pull request #1528 from pi-hole/master Check for merge conflicts #701: Commit c79170f pushed by PromoFaux
January 27, 2024 15:40 2m 10s dev
dev
January 27, 2024 15:40 2m 10s
Merge pull request #1532 from pi-hole/dependabot/pip/test/dev/black-2… Check for merge conflicts #700: Commit 317fb86 pushed by yubiuser
January 27, 2024 13:35 2m 11s dev
dev
January 27, 2024 13:35 2m 11s
Bump black from 23.12.1 to 24.1.0 in /test Check for merge conflicts #699: Commit 119ae73 pushed by dependabot bot
January 27, 2024 10:57 10s dependabot/pip/test/dev/black-24.1.0
dependabot/pip/test/dev/black-24.1.0
January 27, 2024 10:57 10s
Merge pull request #1529 from pi-hole/builder_fontend Check for merge conflicts #698: Commit 2cabcc6 pushed by PromoFaux
January 12, 2024 19:19 2m 14s development-v6
development-v6
January 12, 2024 19:19 2m 14s
Add dockerfile frontend synatax line Check for merge conflicts #697: Commit 24090b2 pushed by yubiuser
January 10, 2024 12:49 11s builder_fontend
builder_fontend
January 10, 2024 12:49 11s
Update the v6 workflow in the master branch so that the nightly conti… Check for merge conflicts #696: Commit b9ca401 pushed by PromoFaux
January 9, 2024 17:44 11s master
master
January 9, 2024 17:44 11s
Merge pull request #1527 from pi-hole/v6/fix-actions-finally Check for merge conflicts #695: Commit ae7ea35 pushed by PromoFaux
January 7, 2024 21:57 2m 10s development-v6
development-v6
January 7, 2024 21:57 2m 10s
Simplify build and publish action for v6 Check for merge conflicts #694: Pull request #1527 synchronize by PromoFaux
January 7, 2024 20:24 11s
January 7, 2024 20:24 11s
Simplify build and publish action for v6. No need to have an addition… Check for merge conflicts #693: Commit d3bb3bd pushed by PromoFaux
January 7, 2024 20:24 11s v6/fix-actions-finally
v6/fix-actions-finally
January 7, 2024 20:24 11s
Simplify build and publish action for v6. No need to have an addition… Check for merge conflicts #692: Commit eb8ba45 pushed by PromoFaux
January 7, 2024 14:36 10s v6/fix-actions-finally
v6/fix-actions-finally
January 7, 2024 14:36 10s
Simplify build matrix and fix digests Check for merge conflicts #691: Commit 0ae5b0b pushed by PromoFaux
January 7, 2024 14:35 10s v6/fix-actions-finally
v6/fix-actions-finally
January 7, 2024 14:35 10s
Merge pull request #1526 from pi-hole/registry_digest Check for merge conflicts #690: Commit 50b8c64 pushed by PromoFaux
January 7, 2024 13:13 2m 11s development-v6
development-v6
January 7, 2024 13:13 2m 11s
Merge pull request #1472 from pi-hole/tweak/dependabot Check for merge conflicts #689: Commit 184b8bb pushed by PromoFaux
January 7, 2024 08:08 12s 2024.01.0
2024.01.0
January 7, 2024 08:08 12s
Consider registry when up/downloading artifacts Check for merge conflicts #688: Commit f4f91f7 pushed by yubiuser
January 6, 2024 20:31 11s registry_digest
registry_digest
January 6, 2024 20:31 11s
Merge pull request #1517 from pi-hole/artifacts Check for merge conflicts #687: Commit 0c9e8ee pushed by yubiuser
January 6, 2024 12:27 2m 12s development-v6
development-v6
January 6, 2024 12:27 2m 12s