From d0559154d5c792325769dea6ee53aed175aa776a Mon Sep 17 00:00:00 2001 From: hedi bouattour Date: Mon, 21 Aug 2023 14:06:47 +0000 Subject: [PATCH] ci: update go version in ci dependencies image --- .ci/Dockerfile.depend | 4 ++-- go.mod | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.ci/Dockerfile.depend b/.ci/Dockerfile.depend index 612236e9..879f4422 100644 --- a/.ci/Dockerfile.depend +++ b/.ci/Dockerfile.depend @@ -11,7 +11,7 @@ RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \ apt-utils wget cmake curl git -ENV GOVERSION=1.18.2 +ENV GOVERSION=1.20.7 ENV GOROOT="/root/.go" ENV GOPATH="/root/go" ENV PATH=$GOROOT/bin:$PATH @@ -22,7 +22,7 @@ RUN mkdir -p "${GOROOT}" &&\ RUN wget -nv "https://dl.google.com/go/go${GOVERSION}.linux-amd64.tar.gz" -O "/tmp/go.tar.gz" && \ tar -C "${GOROOT}" --strip-components=1 -xzf "/tmp/go.tar.gz" && \ rm -f "/tmp/go.tar.gz" && \ - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.50.1 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.2 # Get modules used by the source code COPY . /vpp-dataplane diff --git a/go.mod b/go.mod index 9ad1dc77..06f4dc05 100644 --- a/go.mod +++ b/go.mod @@ -140,6 +140,7 @@ require ( // - Add comments e.g. `// v3.23.0` to make the commit hash(s) explicit replace ( + github.com/projectcalico/api => github.com/projectcalico/api v0.0.0-20230602153125-fb7148692637 // v3.26.0 k8s.io/api => k8s.io/api v0.26.3 k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.3 k8s.io/apimachinery => k8s.io/apimachinery v0.26.3