From 5f8ffcd940a8f3912e9490cb10b1c19240c3ee0b Mon Sep 17 00:00:00 2001 From: Mick Grove Date: Mon, 14 Jul 2025 19:44:28 -0700 Subject: [PATCH] updated github actions to upgrade build from 1.85.0 to 1.88.0 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 10 +++++----- Makefile | 14 +++++++------- src/git_metadata_graph.rs | 7 +------ 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c46ebf6..389b9c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.85.0 + toolchain: 1.88.0 profile: minimal override: true - uses: swatinem/rust-cache@v2 @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.85.0 + toolchain: 1.88.0 profile: minimal override: true - uses: swatinem/rust-cache@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cc46915..b681f1b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: - toolchain: 1.85.0 + toolchain: 1.88.0 profile: minimal override: true @@ -43,7 +43,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: - toolchain: 1.85.0 + toolchain: 1.88.0 profile: minimal override: true @@ -72,7 +72,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: - toolchain: 1.85.0 + toolchain: 1.88.0 profile: minimal override: true @@ -103,7 +103,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: - toolchain: 1.85.0 + toolchain: 1.88.0 profile: minimal override: true @@ -134,7 +134,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.85.0 + toolchain: 1.88.0 profile: minimal override: true diff --git a/Makefile b/Makefile index da375d4..540959e 100644 --- a/Makefile +++ b/Makefile @@ -110,11 +110,11 @@ setup-zig: ubuntu-x64: setup-zig # ensures Zig & cargo-zigbuild exist @echo "Checking Rust toolchain…" @$(MAKE) check-rust || { \ - echo "🦀 Installing Rust 1.85.0 …"; \ + echo "🦀 Installing Rust 1.88.0 …"; \ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y; \ . $$HOME/.cargo/env; \ - rustup toolchain install 1.85.0; \ - rustup default 1.85.0; \ + rustup toolchain install 1.88.0; \ + rustup default 1.88.0; \ } @echo "📦 Installing build dependencies (musl, cmake, etc.)…" @@ -150,11 +150,11 @@ ubuntu-x64: setup-zig # ensures Zig & cargo-zigbuild exist ubuntu-arm64: setup-zig # ensures Zig & cargo-zigbuild exist @echo "Checking Rust toolchain…" @$(MAKE) check-rust || { \ - echo "🦀 Installing Rust 1.85.0 …"; \ + echo "🦀 Installing Rust 1.88.0 …"; \ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y; \ . $$HOME/.cargo/env; \ - rustup toolchain install 1.85.0; \ - rustup default 1.85.0; \ + rustup toolchain install 1.88.0; \ + rustup default 1.88.0; \ } @echo "📦 Installing build dependencies (musl, cmake, etc.)…" @@ -391,7 +391,7 @@ check-rust: echo "Rust not found."; \ exit 1; \ fi; \ - required=1.85.0; \ + required=1.88.0; \ if [ $$(printf '%s\n' "$$required" "$$version" | sort -V | head -n1) != "$$required" ]; then \ echo "Rust version $$version is older than required $$required."; \ exit 1; \ diff --git a/src/git_metadata_graph.rs b/src/git_metadata_graph.rs index 9144068..04d6729 100644 --- a/src/git_metadata_graph.rs +++ b/src/git_metadata_graph.rs @@ -139,17 +139,13 @@ impl RepositoryIndex { let mut num_trees = 0; let mut num_blobs = 0; let mut num_commits = 0; - let count = 0; - + for oid in odb .iter() .context("Failed to iterate object database")? .with_ordering(Ordering::PackLexicographicalThenLooseLexicographical) { let oid = unwrap_ok_or_continue!(oid, |e| debug!("Failed to read object id: {e}")); - // if count % 100000 == 0 { - // debug!("Indexed {} objects in RepositoryIndex::new", count); - // } let hdr = unwrap_ok_or_continue!(odb.header(oid), |e| { debug!("Failed to read object header for {oid}: {e}") }); @@ -160,7 +156,6 @@ impl RepositoryIndex { Kind::Tag => num_tags += 1, } } - debug!("Total objects to map in RepositoryIndex::new: {}", count); let mut trees = ObjectIdBimap::with_capacity(num_trees); let mut commits = ObjectIdBimap::with_capacity(num_commits);