From fb51b57234e3227e00b1866f7ed93bf9d1bc90db Mon Sep 17 00:00:00 2001 From: Jeff Dickey <216188+jdx@users.noreply.github.com> Date: Tue, 14 May 2024 01:05:44 +0000 Subject: [PATCH] chore: always build with git2 feature --- .github/workflows/release.yml | 2 +- Cargo.toml | 1 - src/build_time.rs | 6 ------ 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c54213bc4..e4ccdc4d6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,7 +80,7 @@ jobs: - run: scripts/setup-zipsign.sh env: ZIPSIGN: ${{ secrets.ZIPSIGN }} - - run: scripts/build-tarball.sh mise --features openssl/vendored,git2 --target ${{matrix.target}} + - run: scripts/build-tarball.sh mise --features openssl/vendored --target ${{matrix.target}} - uses: actions/upload-artifact@v4 with: name: tarball-${{matrix.target}} diff --git a/Cargo.toml b/Cargo.toml index 9ef703bb4..41501bed6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -140,7 +140,6 @@ test-case = "3.3.1" [features] default = ["native-tls"] -git2 = [] native-tls = ["reqwest/native-tls"] rustls = ["reqwest/rustls-tls", "self_update/rustls"] rustls-native-roots = ["reqwest/rustls-tls-native-roots", "self_update/rustls"] diff --git a/src/build_time.rs b/src/build_time.rs index fb2dd49ad..c18169c6c 100644 --- a/src/build_time.rs +++ b/src/build_time.rs @@ -5,15 +5,9 @@ pub mod built_info { include!(concat!(env!("OUT_DIR"), "/built.rs")); } -#[cfg(feature = "git2")] pub fn git_sha() -> &'static Option<&'static str> { &built_info::GIT_COMMIT_HASH_SHORT } -#[cfg(not(feature = "git2"))] -pub fn git_sha() -> &'static Option<&'static str> { - &None -} - pub static BUILD_TIME: Lazy> = Lazy::new(|| DateTime::parse_from_rfc2822(built_info::BUILT_TIME_UTC).unwrap());