Merge pull request #834 from fluxcd/libgit2-1.3.2
Update libgit2 to v1.3.2
This commit is contained in:
commit
8cff49f2c9
|
|
@ -3,7 +3,7 @@ ARG GO_VERSION=1.17
|
|||
ARG XX_VERSION=1.1.0
|
||||
|
||||
ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2-all
|
||||
ARG LIBGIT2_TAG=v0.1.1
|
||||
ARG LIBGIT2_TAG=v0.1.2
|
||||
|
||||
FROM ${LIBGIT2_IMG}:${LIBGIT2_TAG} AS libgit2-libs
|
||||
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -4,7 +4,7 @@ TAG ?= latest
|
|||
|
||||
# Base image used to build the Go binary
|
||||
LIBGIT2_IMG ?= ghcr.io/fluxcd/golang-with-libgit2-all
|
||||
LIBGIT2_TAG ?= v0.1.1
|
||||
LIBGIT2_TAG ?= v0.1.2
|
||||
|
||||
# Allows for defining additional Go test args, e.g. '-tags integration'.
|
||||
GO_TEST_ARGS ?= -race
|
||||
|
|
|
|||
|
|
@ -337,7 +337,12 @@ func TestGitRepositoryReconciler_reconcileSource_authStrategy(t *testing.T) {
|
|||
},
|
||||
wantErr: true,
|
||||
assertConditions: []metav1.Condition{
|
||||
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.GitOperationFailedReason, "x509: certificate signed by unknown authority"),
|
||||
// The expected error messages may differ when in darwin. In some cases it will match the
|
||||
// error message expected in linux: "x509: certificate signed by unknown authority". In
|
||||
// other cases it may get "x509: “example.com” certificate is not standards compliant" instead.
|
||||
//
|
||||
// Trimming the expected error message for consistent results.
|
||||
*conditions.TrueCondition(sourcev1.FetchFailedCondition, sourcev1.GitOperationFailedReason, "x509: "),
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
set -euxo pipefail
|
||||
|
||||
LIBGIT2_TAG="${LIBGIT2_TAG:-v0.1.1}"
|
||||
LIBGIT2_TAG="${LIBGIT2_TAG:-v0.1.2}"
|
||||
GOPATH="${GOPATH:-/root/go}"
|
||||
GO_SRC="${GOPATH}/src"
|
||||
PROJECT_PATH="github.com/fluxcd/source-controller"
|
||||
|
|
|
|||
Loading…
Reference in New Issue