ci: package mingw output dir by march, not 'native'
All checks were successful
CI / build-test-release (pull_request) Successful in 12m30s

Setting CRAFTER_BUILD_MARCH=x86-64-v2 made crafter-build emit the
mingw cross-compile to bin/crafter.build-exe-x86_64-w64-mingw32-x86-64-v2/
but the package step still hardcoded -native, causing cp to fail.

Use ${CRAFTER_BUILD_MARCH} in the path so workflow env and packaging
stay in sync.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Jorijn van der Graaf 2026-04-29 00:17:19 +02:00
commit f1199429b7

View file

@ -81,10 +81,12 @@ jobs:
cp -r share "$stage_lin/"
tar czf dist/crafter-build-linux-x86_64.tar.gz -C "$stage_lin" .
# Windows: bin/ contents (exe + auto-bundled mingw DLLs) and share/
# Windows: bin/ contents (exe + auto-bundled mingw DLLs) and share/.
# The output dir is named by march, which matches the env var, not
# the literal "native" — keep these in sync.
stage_win=$(mktemp -d)
mkdir -p "$stage_win/bin"
cp bin/crafter.build-exe-x86_64-w64-mingw32-native/* "$stage_win/bin/"
cp "bin/crafter.build-exe-x86_64-w64-mingw32-${CRAFTER_BUILD_MARCH}"/* "$stage_win/bin/"
cp -r share "$stage_win/"
(cd "$stage_win" && zip -r "$GITHUB_WORKSPACE/dist/crafter-build-windows-x86_64.zip" .)