]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/ci-rust'
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Oct 2025 17:29:09 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Oct 2025 17:29:09 +0000 (10:29 -0700)
CI improvements to handle the recent Rust integration better.

* ps/ci-rust:
  rust: support for Windows
  ci: verify minimum supported Rust version
  ci: check for common Rust mistakes via Clippy
  rust/varint: add safety comments
  ci: check formatting of our Rust code
  ci: deduplicate calls to `apt-get update`

1  2 
.github/workflows/main.yml
Makefile
ci/install-dependencies.sh
meson.build

Simple merge
diff --cc Makefile
index 1919d35bf3fb5f7e6d80dd7f2c7ea5d949c66602,366fd173e70c14ec8e9abb5c8d48c45f6706324e..562e637fa062d11d55eec5b0ee9f7a8f40aa8065
+++ b/Makefile
@@@ -927,13 -927,23 +927,20 @@@ export PYTHON_PAT
  TEST_SHELL_PATH = $(SHELL_PATH)
  
  LIB_FILE = libgit.a
 -XDIFF_LIB = xdiff/lib.a
 -REFTABLE_LIB = reftable/libreftable.a
  ifdef DEBUG
- RUST_LIB = target/debug/libgitcore.a
+ RUST_TARGET_DIR = target/debug
  else
- RUST_LIB = target/release/libgitcore.a
+ RUST_TARGET_DIR = target/release
+ endif
+ ifeq ($(uname_S),Windows)
+ RUST_LIB = $(RUST_TARGET_DIR)/gitcore.lib
+ else
+ RUST_LIB = $(RUST_TARGET_DIR)/libgitcore.a
  endif
  
 -# xdiff and reftable libs may in turn depend on what is in libgit.a
 -GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(LIB_FILE)
 +GITLIBS = common-main.o $(LIB_FILE)
  EXTLIBS =
  
  GIT_USER_AGENT = git/$(GIT_VERSION)
Simple merge
diff --cc meson.build
Simple merge