diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1991595a..cf53cfe5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,8 +36,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        #toolchain: [1.58.1, stable, beta, nightly] # weirdness with 1.58.1 and git2
-        toolchain: [stable, beta, nightly]
+        toolchain: [1.58.1, stable, beta, nightly] # weirdness with 1.58.1 and git2
+        #toolchain: [stable, beta, nightly]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml
index 4519aa90..4687206e 100644
--- a/codegen/Cargo.toml
+++ b/codegen/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 anyhow = { version = "1" }
 clap = { version = "3", default-features = false, features = ["cargo", "std"] }
-git2 = { version = "0.16", default-features = false }
+git2 = { version = "0.18", default-features = false }
 globset = { version = "0.4", default-features = false }
 rustfmt-wrapper = { version = "0.2" }
 serde = { version = "1.0", default-features = false, features = ["std"] }