diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 389c744..feb74e6 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -97,16 +97,19 @@ jobs: # steps below reference these short names. short=${march##*-} + # VariantId is "----"; CI pins + # mtune=generic so each (target, march) resolves to a single subdir + # but the trailing hash isn't known to the workflow, hence the glob. stage_lin=$(mktemp -d) mkdir -p "$stage_lin/bin" "$stage_lin/lib" - cp "bin/crafter.build-exe-x86_64-pc-linux-gnu-$march/crafter-build" "$stage_lin/bin/" - cp "bin/crafter.build-lib-x86_64-pc-linux-gnu-$march/libcrafter-build.a" "$stage_lin/lib/" + cp bin/crafter.build-exe-x86_64-pc-linux-gnu-$march-*/crafter-build "$stage_lin/bin/" + cp bin/crafter.build-lib-x86_64-pc-linux-gnu-$march-*/libcrafter-build.a "$stage_lin/lib/" cp -r share "$stage_lin/" tar czf "dist/crafter-build-linux-x86_64-$short.tar.gz" -C "$stage_lin" . stage_win=$(mktemp -d) mkdir -p "$stage_win/bin" - cp "bin/crafter.build-exe-x86_64-w64-mingw32-$march"/* "$stage_win/bin/" + cp bin/crafter.build-exe-x86_64-w64-mingw32-$march-*/* "$stage_win/bin/" cp -r share "$stage_win/" (cd "$stage_win" && zip -r "$GITHUB_WORKSPACE/dist/crafter-build-windows-x86_64-$short.zip" .) done