Skip to content

Actions: pi-hole/docker-pi-hole

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
721 workflow runs
721 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #1645 from pi-hole/fix-tests Check for merge conflicts #983: Commit 4c05862 pushed by PromoFaux
September 13, 2024 17:43 2m 10s development
development
September 13, 2024 17:43 2m 10s
Fix development tests Check for merge conflicts #982: Pull request #1645 synchronize by PromoFaux
September 13, 2024 17:36 10s
September 13, 2024 17:36 10s
Clean Shutdown test: Remove check for the "Shutting down..." line in … Check for merge conflicts #981: Commit af8863a pushed by PromoFaux
September 13, 2024 17:36 10s fix-tests
fix-tests
September 13, 2024 17:36 10s
Fix development tests Check for merge conflicts #980: Pull request #1645 synchronize by PromoFaux
September 13, 2024 17:27 10s
September 13, 2024 17:27 10s
Clean Shutdown test: Remove check for the "Shutting down..." line in … Check for merge conflicts #979: Commit 357a6cb pushed by PromoFaux
September 13, 2024 17:27 10s fix-tests
fix-tests
September 13, 2024 17:27 10s
Clean Shutdown test: Remove check for the "Shutting down..." line in … Check for merge conflicts #978: Commit ead9c18 pushed by PromoFaux
September 13, 2024 17:23 11s fix-tests
fix-tests
September 13, 2024 17:23 11s
Add some hardening to the build script Check for merge conflicts #977: Pull request #1644 synchronize by PromoFaux
September 13, 2024 16:54 10s
September 13, 2024 16:54 10s
Add some hardening to the build script. Check if system has docker bu… Check for merge conflicts #976: Commit a200625 pushed by PromoFaux
September 13, 2024 16:54 14s sanity-check-downloaded-FTL
sanity-check-downloaded-FTL
September 13, 2024 16:54 14s
Add some hardening to the build script Check for merge conflicts #975: Pull request #1644 synchronize by PromoFaux
September 11, 2024 21:52 9s
September 11, 2024 21:52 9s
Add some hardening to the build script. Check if system has docker bu… Check for merge conflicts #974: Commit 1b0c41d pushed by PromoFaux
September 11, 2024 21:52 9s sanity-check-downloaded-FTL
sanity-check-downloaded-FTL
September 11, 2024 21:52 9s
Add some hardening to the build script Check for merge conflicts #973: Pull request #1644 synchronize by PromoFaux
September 11, 2024 21:49 13s
September 11, 2024 21:49 13s
Add some hardening to the build script. Check if system has docker bu… Check for merge conflicts #972: Commit c710042 pushed by PromoFaux
September 11, 2024 21:49 9s sanity-check-downloaded-FTL
sanity-check-downloaded-FTL
September 11, 2024 21:49 9s
Add some hardening to the build script. Check if system has docker bu… Check for merge conflicts #971: Commit 476ed10 pushed by PromoFaux
September 11, 2024 21:24 11s sanity-check-downloaded-FTL
sanity-check-downloaded-FTL
September 11, 2024 21:24 11s
Merge pull request #1643 from pi-hole/sanity-check-downloaded-FTL Check for merge conflicts #970: Commit 3454f65 pushed by PromoFaux
September 11, 2024 20:11 13s development
development
September 11, 2024 20:11 13s
Confirm validity of downloaded FTL binary when building Check for merge conflicts #969: Pull request #1643 synchronize by PromoFaux
September 11, 2024 18:13 11s
September 11, 2024 18:13 11s
Actually do something with the result of readelf in case of invalid… Check for merge conflicts #968: Commit e938d1a pushed by PromoFaux
September 11, 2024 18:13 11s sanity-check-downloaded-FTL
sanity-check-downloaded-FTL
September 11, 2024 18:13 11s
Actually do something with the result of readelf in case of invalid… Check for merge conflicts #967: Commit f10a3b9 pushed by PromoFaux
September 11, 2024 18:01 10s sanity-check-downloaded-FTL
sanity-check-downloaded-FTL
September 11, 2024 18:01 10s
Actually do something with the result of readelf in case of invalid… Check for merge conflicts #966: Commit 99b3fc3 pushed by PromoFaux
September 11, 2024 17:54 15s sanity-check-downloaded-FTL
sanity-check-downloaded-FTL
September 11, 2024 17:54 15s
Merge pull request #1641 from pi-hole/migrage-dnsmasq-conf Check for merge conflicts #965: Commit 2823d1d pushed by PromoFaux
September 6, 2024 14:51 44s development
development
September 6, 2024 14:51 44s
Migrate old Pi-hole owned dnsmasq config files into /etc/pihole/migration_backup_v6 Check for merge conflicts #964: Pull request #1641 synchronize by PromoFaux
September 5, 2024 18:29 12s
September 5, 2024 18:29 12s
Migrate the dnsmasq.d configs that are owned by Pi-hole into /etc/pih… Check for merge conflicts #963: Commit df97235 pushed by PromoFaux
September 5, 2024 18:29 13s migrage-dnsmasq-conf
migrage-dnsmasq-conf
September 5, 2024 18:29 13s
Migrate the dnsmasq.d configs that are owned by Pi-hole into /etc/pih… Check for merge conflicts #962: Commit c03015f pushed by PromoFaux
September 5, 2024 18:27 10s migrage-dnsmasq-conf
migrage-dnsmasq-conf
September 5, 2024 18:27 10s
Update branch name in sync-back-to-dev workflow Check for merge conflicts #961: Commit 4cb3c3a pushed by PromoFaux
September 5, 2024 07:31 2m 12s master
master
September 5, 2024 07:31 2m 12s
Revert "Sync master back into development" Check for merge conflicts #960: Commit 01b9249 pushed by PromoFaux
September 5, 2024 06:05 11s revert-1639-master
revert-1639-master
September 5, 2024 06:05 11s
Take a leaf from the bare metal pihole-FTL service and introduce a wr… Check for merge conflicts #959: Commit 2aabc4c pushed by PromoFaux
September 2, 2024 22:52 10s v6/service-wrapper
v6/service-wrapper
September 2, 2024 22:52 10s