Skip to content

ci: spec22-gems msys harness presses probe images in the leg's format #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ronaldtse merged 1 commit into from
Sep 22, 2026
Merged

ci: spec22-gems msys harness presses probe images in the leg's format #113

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions ci/spec22-gems/run-msys.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,17 @@ case "$pkg_stem" in
esac
UCRT64_BIN="${UCRT64_BIN:-/d/a/_temp/msys64/$MSYS_TOOLCHAIN/bin}"

# The probe images press in the format the leg's own driver mounts:
# dwarfs on x64 (the x64 env image's format), limnifs on arm64 — the
# arm64 link unit is limnifs-only (clangarm64 has no native dwarfs-t),
# so its driver never mounts dwarfs bytes and the tfs CLI fails a
# dwarfs press there by name ("mkimage --format dwarfs is not available
# on windows-arm64").
case "$MSYS_TOOLCHAIN" in
clangarm64) PRESS_FORMAT=limnifs ;;
*) PRESS_FORMAT=dwarfs ;;
esac

[ -x "$TFS_CLI" ] || [ -f "$TFS_CLI" ] || die "tfs CLI not at $TFS_CLI (download the tebako release's windows tfs.exe)"

# <cpu-tag>-ucrt-ruby<ABI>.dll — ruby configure's RUBY_SO_NAME for a
Expand Down Expand Up @@ -239,7 +250,7 @@ if [ ! -f "$SETUP_IMG" ] || [ "$SELF_DIR/fixtures/gem.rb" -nt "$SETUP_IMG" ] \
cp "$SELF_DIR/fixtures/gem.rb" "$SCRATCH/setup-tree/setup/"
cp "$SELF_DIR/fixtures/envprobe.rb" "$SCRATCH/setup-tree/setup/"
cp "$SELF_DIR/fixtures/pipeprobe.rb" "$SCRATCH/setup-tree/setup/"
"$TFS_CLI" mkimage --format dwarfs "$(w "$SCRATCH/setup-tree")" --output "$(w "$SETUP_IMG")" >/dev/null
"$TFS_CLI" mkimage --format "$PRESS_FORMAT" "$(w "$SCRATCH/setup-tree")" --output "$(w "$SETUP_IMG")" >/dev/null
fi

# --- 3.5 env diagnostic: Etc.sysconfdir under scrubbed envs -------------
Expand Down Expand Up @@ -494,11 +505,11 @@ if [ ! -f "$PAYLOAD_IMG" ] || [ ! -f "$PAYLOAD_IMG_NOMAT" ] \
cp "$SELF_DIR/fixtures/payload-manifest.yaml" "$PROBE_TREE/__tpkg__/manifest.yaml"
stamp_library_aliases "$PROBE_TREE/__tpkg__/manifest.yaml"
rm -f "$PAYLOAD_IMG"
"$TFS_CLI" mkimage --format dwarfs "$(w "$PROBE_TREE")" --output "$(w "$PAYLOAD_IMG")" >/dev/null
"$TFS_CLI" mkimage --format "$PRESS_FORMAT" "$(w "$PROBE_TREE")" --output "$(w "$PAYLOAD_IMG")" >/dev/null
cp "$SELF_DIR/fixtures/payload-manifest-unmaterialized.yaml" "$PROBE_TREE/__tpkg__/manifest.yaml"
stamp_library_aliases "$PROBE_TREE/__tpkg__/manifest.yaml"
rm -f "$PAYLOAD_IMG_NOMAT"
"$TFS_CLI" mkimage --format dwarfs "$(w "$PROBE_TREE")" --output "$(w "$PAYLOAD_IMG_NOMAT")" >/dev/null
"$TFS_CLI" mkimage --format "$PRESS_FORMAT" "$(w "$PROBE_TREE")" --output "$(w "$PAYLOAD_IMG_NOMAT")" >/dev/null
"$TFS_CLI" cat "$(w "$PAYLOAD_IMG")" /__tpkg__/manifest.yaml | grep -q "^materialize:" \
|| die "the pressed image lost the materialize: key (spec 22 §4)"
"$TFS_CLI" cat "$(w "$PAYLOAD_IMG_NOMAT")" /__tpkg__/manifest.yaml | grep -q "^materialize:" \
Expand Down
Loading