From bdf1de46785b8ebc17072983c96317137d1ce1b4 Mon Sep 17 00:00:00 2001 From: vardhaman22 Date: Mon, 10 Jun 2024 21:44:15 +0530 Subject: [PATCH] update golang to 1.22 and golangci-lint to v1.59.0 --- .github/workflows/apidiff.yaml | 2 +- .github/workflows/build.yaml | 2 +- .github/workflows/e2e.yaml | 2 +- .github/workflows/lint.yaml | 2 +- .github/workflows/unit.yaml | 2 +- .github/workflows/verify.yaml | 2 +- Dockerfile.dapper | 4 ++-- test/e2e/Dockerfile.e2e | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/apidiff.yaml b/.github/workflows/apidiff.yaml index 0234d22c..9676ad03 100644 --- a/.github/workflows/apidiff.yaml +++ b/.github/workflows/apidiff.yaml @@ -10,6 +10,6 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: 1.22.x - name: Generate API diff run: make apidiff diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8278c323..b8d71f5a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,6 +15,6 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: 1.22.x - name: Build run: make operator diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 0804b525..b8673a2a 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -60,7 +60,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: 1.22.x - uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0 with: version: v0.23.0 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 27ebcf90..c1634c8b 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -15,7 +15,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: 1.22.x - name: Analysis uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1 with: diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml index f5152d95..60efd38f 100644 --- a/.github/workflows/unit.yaml +++ b/.github/workflows/unit.yaml @@ -12,7 +12,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: 1.22.x - name: Run tests run: | make test diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index 3d94504c..a6bb2f22 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -12,7 +12,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: 1.22.x - name: Run make verify run: | make verify diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 2d7dac9a..8d33798c 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -8,14 +8,14 @@ RUN zypper -n update && \ ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \ GOPATH=/go CGO_ENABLED=0 PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash -RUN curl -sLf https://storage.googleapis.com/golang/go1.21.10.linux-${ARCH}.tar.gz | tar -xzf - -C /usr/local/ +RUN curl -sLf https://storage.googleapis.com/golang/go1.22.3.linux-${ARCH}.tar.gz | tar -xzf - -C /usr/local/ # workaround for https://bugzilla.suse.com/show_bug.cgi?id=1183043 RUN if [ "${ARCH}" == "arm64" ]; then \ zypper -n install binutils-gold ; \ fi RUN if [ "${ARCH}" = "amd64" ]; then \ - curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.40.1; \ + curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.59.0; \ fi RUN curl -sL https://get.helm.sh/helm-v3.3.0-linux-${ARCH}.tar.gz | tar xvzf - -C /usr/local/bin --strip-components=1 diff --git a/test/e2e/Dockerfile.e2e b/test/e2e/Dockerfile.e2e index 6f18feee..8fa42649 100644 --- a/test/e2e/Dockerfile.e2e +++ b/test/e2e/Dockerfile.e2e @@ -1,4 +1,4 @@ -FROM registry.suse.com/bci/golang:1.21 AS build +FROM registry.suse.com/bci/golang:1.22 AS build RUN zypper -n install -l openssl-devel WORKDIR /src COPY go.mod go.sum /src/