ci: fix Windows regression test runner#401
Merged
spe-ciellt merged 3 commits intogerbv:developfrom Mar 8, 2026
Merged
Conversation
Add mingw-w64-ucrt-x86_64-imagemagick to MSYS2 packages so compare, composite, and convert are available for the regression test image diff checks. Use PATH instead of LD_LIBRARY_PATH on Windows so the test runner can find libgerbv.dll at runtime.
Generate authors.c/bugs.c at configure time via execute_process() so xgettext doesn't fail on clean checkouts where the generated files don't yet exist. Auto-detect ImageMagick v7 in run_tests.sh and use "magick <subcommand>" syntax instead of bare command names. This fixes deprecation warnings on all CI platforms and avoids the Windows convert.exe collision.
In IMv7 "convert" was merged into "magick" itself — "magick convert" still works but emits a deprecation warning. All other tools use "magick <subcommand>" but convert is the special case where the subcommand was dropped entirely.
Contributor
|
One maintenance note: the I will merge this before release, with or without fix. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Follow-up to #378. Fixes the remaining cross-platform CI issues from the Windows regression test work.
Changes
Fix xgettext configure-time race (
config/CMakeLists.txt)Gettext_helpers.cmakerunsxgettextat configure time, butauthors.c/bugs.cdon't exist yet (they're generated at build time)execute_process()to generate these files at configure time using the samegenerate_headers.cmakescript — pure CMakefile()commands, no external toolsadd_custom_commandstays for incremental rebuildsFix IMv7
convertdeprecation (test/run_tests.sh)convert,compare, etc. are deprecated in favor ofmagicksubcommandsconvertalso collides with the Windowsconvert.exedisk utilitycommand -v magickand prefix all IM tool invocations accordinglyconvertis a special case — it was merged intomagickitself, so it maps to baremagick(notmagick convert, which still emits a deprecation warning)IM_COMPARE, etc.) still workPrevious changes (from earlier commits)
imagemagick:pto the MSYS2 UCRT64 package list inci.yamlPATHinstead ofLD_LIBRARY_PATHon Windows intest/CMakeLists.txtTest results
continue-on-error: true)Test plan
command not founderrors