Downgrade to libgit2 1.1 and git2go v31

In an attempt to get a working set of dependecies for both the
source-controller _and_ the image-automation-controller, as the latter
mysterically fails.

Signed-off-by: Hidde Beydals <hello@hidde.co>

Author: hiddeco

Makefile

@@ -5,7 +5,7 @@ STATIC_TEST_TAG := test
 PLATFORMS ?= linux/amd64,linux/arm/v7,linux/arm64
 BUILD_ARGS ?=
 
-GIT2GO_TAG ?= v32.0.4
+GIT2GO_TAG ?= v31.6.1
 
 .PHONY: build
 build:

README.md

@@ -37,6 +37,10 @@ while testing these against the git2go code before releasing the image.
 - [ ] `libgit2-1.1` depends on `libmdtls12` which [does not provide support for ED25519 (yet)][mbedtls-ed25519].
 - [ ] In some observations, a mix of mbedTLS and OpenSSL linking seemed to happen, making it harder to determine what
       C-dependency  was the cause of a malfunction.
+- [ ] The `1.2` release of `libgit2` in combination with `git2go/v32` does not seem to work properly:
+  - [ ] [libgit2/git2go#834](https://github.com/libgit2/git2go/issues/834)
+  - [ ] [libgit2/git2go#836](https://github.com/libgit2/git2go/issues/836)
+  - [ ] [libgit2/git2go#837](https://github.com/libgit2/git2go/issues/837)
 
 ## Usage
 

hack/Makefile

@@ -3,11 +3,13 @@ FLAGS ?=
 
 INSTALL_PREFIX ?= /usr
 INSTALL_LIBDIR ?= $(INSTALL_PREFIX)/lib
+USE_HTTPS ?= OpenSSL
+USE_SSH ?= ON
 
-LIBGIT2_VERSION ?= 1.2.0
+LIBGIT2_VERSION ?= 1.1.1
 # Overwritten to a specific version by default for git2go support
 # Ref: https://github.com/libgit2/git2go/issues/834
-LIBGIT2_REVISION ?= 109b4c887ffb63962c7017a66fc4a1f48becb48e
+LIBGIT2_REVISION ?=
 
 ifeq ($(LIBGIT2_REVISION),)
 LIBGIT2_DOWNLOAD_URL ?= https://github.com/libgit2/libgit2/archive/refs/tags/v$(LIBGIT2_VERSION).tar.gz
@@ -34,8 +36,8 @@ $(INSTALL_LIBDIR)/libgit2.so.$(LIBGIT2_VERSION):
 	  -DUSE_BUNDLED_ZLIB:BOOL=OFF \
 	  -DUSE_HTTP_PARSER:STRING=builtin  \
 	  -DREGEX_BACKEND:STRING=builtin \
-	  -DUSE_HTTPS:STRING=OpenSSL \
-	  -DUSE_SSH:BOOL=ON \
+	  -DUSE_HTTPS:STRING=$(USE_HTTPS) \
+	  -DUSE_SSH:BOOL=$(USE_SSH) \
 	  $(FLAGS) \
 	&& cmake --build $$SETUP_LIBGIT2_TMP_DIR/build --target install \
 	&& rm -rf $$SETUP_LIBGIT2_TMP_DIR