On 2025-11-20 at 19:52:23, Ezekiel Newren wrote: > Checkout my retrospective review [1]. Basically if windows + msvc -> > .lib else lib.a, but it was coded as just if windows -> > ... > > In the github ci these are the only windows combos that are tested. > "win build" is windows + gnu + Makefile > "win+Meson build" windows + msvc + Meson So I don't think that fixes the build[0] with this patch: -- %< -- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Thu, 20 Nov 2025 22:52:37 +0000 Subject: [PATCH] WIP: try fixing CI Signed-off-by: brian m. carlson --- Makefile | 2 +- src/cargo-meson.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b05709c5e9..8bdb05e535 100644 --- a/Makefile +++ b/Makefile @@ -934,7 +934,7 @@ else RUST_TARGET_DIR = target/release endif -ifeq ($(uname_S),Windows) +ifdef MSVC RUST_LIB = $(RUST_TARGET_DIR)/gitcore.lib else RUST_LIB = $(RUST_TARGET_DIR)/libgitcore.a diff --git a/src/cargo-meson.sh b/src/cargo-meson.sh index 3998db0435..80c10b22cf 100755 --- a/src/cargo-meson.sh +++ b/src/cargo-meson.sh @@ -27,7 +27,7 @@ then fi case "$(cargo -vV | sed -s 's/^host: \(.*\)$/\1/')" in - *-windows-*) + *-windows-msvc*) LIBNAME=gitcore.lib;; *) LIBNAME=libgitcore.a;; -- 2.51.0.338.gd7d06c2dae8 -- %< -- [0] https://github.com/bk2204/git/actions/runs/19553883891/job/55991786359 -- brian m. carlson (they/them) Toronto, Ontario, CA