From 5666f5dd9105fb1e6eff0d3dc46a3ff52a88d88d Mon Sep 17 00:00:00 2001
From: Gabriele Musco <gabriele.musco@skytv.it>
Date: Tue, 27 Feb 2024 11:37:04 +0100
Subject: [PATCH 1/2] feat: update git2 dependency

---
 Cargo.lock | 22 ++++++++++++++--------
 Cargo.toml |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ff5e44d..d674500 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -43,6 +43,12 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
 [[package]]
 name = "block-buffer"
 version = "0.7.3"
@@ -119,7 +125,7 @@ checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 dependencies = [
  "ansi_term",
  "atty",
- "bitflags",
+ "bitflags 1.2.1",
  "strsim",
  "textwrap",
  "unicode-width",
@@ -185,11 +191,11 @@ dependencies = [
 
 [[package]]
 name = "git2"
-version = "0.11.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77519ef7c5beee314d0804d4534f01e0f9e8d9acdee2b7a48627e590b27e0ec4"
+checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.2",
  "libc",
  "libgit2-sys",
  "log",
@@ -293,9 +299,9 @@ checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.10.0"
+version = "0.16.2+1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9ec6bca50549d34a392611dde775123086acbd994e3fff64954777ce2dc2e51"
+checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8"
 dependencies = [
  "cc",
  "libc",
@@ -305,9 +311,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.0.25"
+version = "1.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
+checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6"
 dependencies = [
  "cc",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index ea348f2..07ed86b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,7 @@ version = "1"
 features = ["derive"]
 
 [dependencies.git2]
-version = "0.11"
+version = "0.18"
 default-features = false
 
 [dependencies.tera]

From 9c955ded54008b2924f7ec008e34732fbb29f355 Mon Sep 17 00:00:00 2001
From: Gabriele Musco <gabriele.musco@skytv.it>
Date: Tue, 27 Feb 2024 16:14:28 +0100
Subject: [PATCH 2/2] chore(ci): use rust:alpine as ci image

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dde8ae8..e794e55 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   build:
     docker:
-      - image: ekidd/rust-musl-builder:1.57.0
+      - image: rust:alpine
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -12,8 +12,8 @@ jobs:
       - run:
           name: Skip post-release commit
           command: |
-            shopt -s nocasematch
-            case $(git log --oneline --format=%B -n 1 HEAD) in "chore: restore UNRELEASED version") circleci step halt;; esac
+            apk add bash musl-dev
+            bash -c 'shopt -s nocasematch; case $(git log --oneline --format=%B -n 1 HEAD) in "chore: restore UNRELEASED version") circleci step halt;; esac'
       - run:
           name: Version information
           command: rustc --version; cargo --version; rustup --version