Skip to content

Actions: cctbx/dxtbx

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflicts.yml
493 workflow runs
493 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add build script identify merge conflicts #3770: Commit b84c141 pushed by ndevenish
January 10, 2025 15:10 17s conda_build
conda_build
January 10, 2025 15:10 17s
Bump the working dev version post-release identify merge conflicts #3769: Commit 06227db pushed by ndevenish
January 10, 2025 15:09 2m 14s main
main
January 10, 2025 15:09 2m 14s
Generating meta identify merge conflicts #3768: Commit 890d7e1 pushed by ndevenish
January 10, 2025 13:08 15s conda_build
conda_build
January 10, 2025 13:08 15s
Drop Python 3.9, 3.10 is now the new minimum (#769) identify merge conflicts #3767: Commit 49b4fe7 pushed by ndevenish
January 10, 2025 10:50 13s conda_build
conda_build
January 10, 2025 10:50 13s
Migrate dxtbx build backend to hatchling identify merge conflicts #3766: Pull request #778 synchronize by ndevenish
January 9, 2025 16:00 9s
January 9, 2025 16:00 9s
Rename news to new number identify merge conflicts #3765: Commit 7ab6498 pushed by ndevenish
January 9, 2025 16:00 10s hatch_2
hatch_2
January 9, 2025 16:00 10s
Fix minor type typo identify merge conflicts #3764: Commit bbdc841 pushed by ndevenish
January 9, 2025 15:57 10s hatch_2
hatch_2
January 9, 2025 15:57 10s
Bump version: 3.23.dev → 3.23.0 identify merge conflicts #3763: Commit 3123214 pushed by DiamondLightSource-build-server
January 9, 2025 09:36 10s v3.23.0
v3.23.0
January 9, 2025 09:36 10s
Bump version: 3.23.dev → 3.23.0 identify merge conflicts #3762: Commit 3123214 pushed by DiamondLightSource-build-server
January 9, 2025 09:35 10s dials-next
dials-next
January 9, 2025 09:35 10s
Bump version: 3.23.dev → 3.23.0 identify merge conflicts #3761: Commit 3123214 pushed by DiamondLightSource-build-server
January 9, 2025 09:35 10s dials-3.23
dials-3.23
January 9, 2025 09:35 10s
Bump version: 3.23.dev → 3.24.dev identify merge conflicts #3760: Commit dedf9a1 pushed by DiamondLightSource-build-server
January 8, 2025 11:53 10s dials-3.23rc-main
dials-3.23rc-main
January 8, 2025 11:53 10s
Bump version: 3.23.dev → 3.23.0 identify merge conflicts #3759: Commit 3123214 pushed by DiamondLightSource-build-server
January 8, 2025 11:53 11s dials-3.23rc
dials-3.23rc
January 8, 2025 11:53 11s
Ignore trusted-range in dxtbx.average test identify merge conflicts #3758: Commit 5e7ac49 pushed by ndevenish
January 8, 2025 11:53 11s release_patches
release_patches
January 8, 2025 11:53 11s
Tweaks identify merge conflicts #3757: Commit bae1b44 pushed by ndevenish
January 8, 2025 10:39 11s dials-tweaks-3.23
dials-tweaks-3.23
January 8, 2025 10:39 11s
Pass through resolve_path when the path is not accessible identify merge conflicts #3756: Pull request #777 synchronize by ndevenish
January 7, 2025 16:01 11s
January 7, 2025 16:01 11s
Drop Python 3.9, 3.10 is now the new minimum (#769) identify merge conflicts #3755: Commit 49b4fe7 pushed by ndevenish
January 7, 2025 15:44 2m 29s main
main
January 7, 2025 15:44 2m 29s
Drop Python 3.9, 3.10 is now the new minimum identify merge conflicts #3754: Pull request #769 synchronize by ndevenish
January 7, 2025 15:34 21s
January 7, 2025 15:34 21s
Pass through resolve_path when the path is not accessible identify merge conflicts #3753: Pull request #777 synchronize by dagewa
December 11, 2024 12:09 16s
December 11, 2024 12:09 16s
Revert "Pass through resolve_path when the path is not accessible (… identify merge conflicts #3752: Commit 97bc789 pushed by dagewa
December 10, 2024 16:38 2m 11s main
main
December 10, 2024 16:38 2m 11s
Revert "Pass through resolve_path when the path is not accessible (… identify merge conflicts #3751: Commit d9e3813 pushed by dagewa
December 10, 2024 16:22 26s revert-772-771-pass-through-resolve_path-when-not-accessible
revert-772-771-pass-through-resolve_path-when-not-accessible
December 10, 2024 16:22 26s
Pass through resolve_path when the path is not accessible (#772) identify merge conflicts #3750: Commit d7be9b2 pushed by dagewa
December 10, 2024 15:08 2m 18s main
main
December 10, 2024 15:08 2m 18s
Pass through resolve_path when the path is not accessible identify merge conflicts #3749: Pull request #772 synchronize by dagewa
December 2, 2024 09:44 10s
December 2, 2024 09:44 10s
TQDM -> stdout (#775) identify merge conflicts #3748: Commit edb60e4 pushed by graeme-winter
November 26, 2024 08:31 2m 10s main
main
November 26, 2024 08:31 2m 10s
TQDM -> stdout identify merge conflicts #3747: Pull request #775 synchronize by DiamondLightSource-build-server
November 26, 2024 08:13 11s
November 26, 2024 08:13 11s
Rename newsfragments/XXX.bugfix to newsfragments/775.bugfix identify merge conflicts #3746: Commit e639134 pushed by DiamondLightSource-build-server
November 26, 2024 08:13 9s tqdm-stderr-again
tqdm-stderr-again
November 26, 2024 08:13 9s