Skip to content

Commit 8cff49f

Browse files
author
Paulo Gomes
authored
Merge pull request #834 from fluxcd/libgit2-1.3.2
Update libgit2 to v1.3.2
2 parents 0bf9de3 + 9c21f8a commit 8cff49f

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG GO_VERSION=1.17
33
ARG XX_VERSION=1.1.0
44

55
ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2-all
6-
ARG LIBGIT2_TAG=v0.1.1
6+
ARG LIBGIT2_TAG=v0.1.2
77

88
FROM ${LIBGIT2_IMG}:${LIBGIT2_TAG} AS libgit2-libs
99

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ TAG ?= latest
44

55
# Base image used to build the Go binary
66
LIBGIT2_IMG ?= ghcr.io/fluxcd/golang-with-libgit2-all
7-
LIBGIT2_TAG ?= v0.1.1
7+
LIBGIT2_TAG ?= v0.1.2
88

99
# Allows for defining additional Go test args, e.g. '-tags integration'.
1010
GO_TEST_ARGS ?= -race

controllers/gitrepository_controller_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,12 @@ func TestGitRepositoryReconciler_reconcileSource_authStrategy(t *testing.T) {
337337
},
338338
wantErr: true,
339339
assertConditions: []metav1.Condition{
340-
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.GitOperationFailedReason, "x509: certificate signed by unknown authority"),
340+
// The expected error messages may differ when in darwin. In some cases it will match the
341+
// error message expected in linux: "x509: certificate signed by unknown authority". In
342+
// other cases it may get "x509: “example.com” certificate is not standards compliant" instead.
343+
//
344+
// Trimming the expected error message for consistent results.
345+
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.GitOperationFailedReason, "x509: "),
341346
},
342347
},
343348
{

tests/fuzz/oss_fuzz_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
set -euxo pipefail
1818

19-
LIBGIT2_TAG="${LIBGIT2_TAG:-v0.1.1}"
19+
LIBGIT2_TAG="${LIBGIT2_TAG:-v0.1.2}"
2020
GOPATH="${GOPATH:-/root/go}"
2121
GO_SRC="${GOPATH}/src"
2222
PROJECT_PATH="github.com/fluxcd/source-controller"

0 commit comments

Comments
 (0)