From ca25bf0c4b11525213e5b3b2967b7d3682220f44 Mon Sep 17 00:00:00 2001 From: DoDiODev Date: Mon, 2 Nov 2026 09:49:17 +0100 Subject: [PATCH] build: bump mockery to 3.9.0 and golangci-lint to 2.15.0 mockery 3.9.0 regenerates byte-identical mocks; the SHA256 values in install-mockery.sh are taken from the release checksum.txt and verified against the downloaded archives. The lake-builder image needs a new builder-v* tag before CI picks up the new mockery. Signed-off-by: DoDiODev --- .github/workflows/golangci-lint.yml | 4 ++-- .github/workflows/test.yml | 2 +- backend/Dockerfile | 2 +- backend/Dockerfile.local | 2 +- backend/Makefile | 4 ++-- backend/scripts/install-mockery.sh | 6 +++--- devops/docker/lake-builder/Dockerfile | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index a21ca46c31c..66890785afc 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -34,7 +34,7 @@ jobs: run: git config --global --add safe.directory $(pwd) - name: Install Go 1.27.3 run: backend/scripts/install-go.sh - - name: Install mockery 3.8.1 + - name: Install mockery 3.9.0 run: backend/scripts/install-mockery.sh - name: Cache golangci-lint id: cache-golangci-lint @@ -50,5 +50,5 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v9 with: - version: v2.14.0 + version: v2.15.0 working-directory: ./backend diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6c0ac07079c..d1d25554a36 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -59,7 +59,7 @@ jobs: cd backend go run ./tools/pluginsgen git diff --exit-code -- plugins/all - - name: Install mockery 3.8.1 + - name: Install mockery 3.9.0 run: backend/scripts/install-mockery.sh - name: Build Python run: | diff --git a/backend/Dockerfile b/backend/Dockerfile index 9ed02234a0a..067a2128f86 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -34,7 +34,7 @@ ARG HTTPS_PROXY= RUN apt-get update RUN apt-get install -y ca-certificates git -RUN go install github.com/vektra/mockery/v3@v3.8.1 +RUN go install github.com/vektra/mockery/v3@v3.9.0 RUN go install github.com/swaggo/swag/cmd/swag@v1.16.6 diff --git a/backend/Dockerfile.local b/backend/Dockerfile.local index bd9a16cf27a..7540e8b5e4e 100644 --- a/backend/Dockerfile.local +++ b/backend/Dockerfile.local @@ -33,7 +33,7 @@ RUN apt-get update && apt-get install -y \ gcc \ ca-certificates -RUN go install github.com/vektra/mockery/v3@v3.8.1 +RUN go install github.com/vektra/mockery/v3@v3.9.0 RUN go install github.com/swaggo/swag/cmd/swag@v1.16.6 WORKDIR /app diff --git a/backend/Makefile b/backend/Makefile index e8bb9128ec8..7a8d230e3d4 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -22,7 +22,7 @@ TAG ?= $(shell if [ -d .git ]; then git tag --points-at HEAD; else echo "local_b IMAGE_REPO ?= "apache" VERSION = $(TAG)@$(SHA) PYTHON_DIR ?= "./python" -MOCKERY_VERSION ?= v3.8.1 +MOCKERY_VERSION ?= v3.9.0 # Always resolve mockery through the module cache instead of relying on whatever # `mockery` happens to be on the PATH: the CI builder image ships mockery v2, # which cannot read the v3 YAML configuration. @@ -37,7 +37,7 @@ all: build go-dep: go install github.com/vektra/mockery/v3@$(MOCKERY_VERSION) go install github.com/swaggo/swag/cmd/swag@v1.16.6 - go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.14.0 + go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.15.0 go-dev-tools: # go install github.com/atombender/go-jsonschema/cmd/gojsonschema@latest diff --git a/backend/scripts/install-mockery.sh b/backend/scripts/install-mockery.sh index 7eb1f16e6c6..20048222050 100755 --- a/backend/scripts/install-mockery.sh +++ b/backend/scripts/install-mockery.sh @@ -17,7 +17,7 @@ set -eu -MOCKERY_VERSION=3.8.1 +MOCKERY_VERSION=3.9.0 INSTALL_DIR=/opt/mockery/$MOCKERY_VERSION MOCKERY_BIN=$INSTALL_DIR/mockery @@ -61,11 +61,11 @@ fi case "$(uname -m)" in x86_64|amd64) archive_name=mockery_${MOCKERY_VERSION}_Linux_x86_64.tar.gz - archive_sha256=953c7d38b58dd6398b1c595f27caf8bbf27e9b733b49c404d2e124e86d2ae72a + archive_sha256=30ca380381763e7c9e8afddeea09c260061aa1580b885a66677bb12ebd9f038d ;; aarch64|arm64) archive_name=mockery_${MOCKERY_VERSION}_Linux_arm64.tar.gz - archive_sha256=d1f481f3a6e9868dd3ad65da265238ee109ab3a5dd7508958d5811953696f452 + archive_sha256=de4951716cc25236d0ee8dd5f18d1c3a08ab10315028e4313a7aee7526760d13 ;; *) echo "unsupported architecture: $(uname -m)" >&2 diff --git a/devops/docker/lake-builder/Dockerfile b/devops/docker/lake-builder/Dockerfile index 64c95bbebe3..344c8852fe8 100644 --- a/devops/docker/lake-builder/Dockerfile +++ b/devops/docker/lake-builder/Dockerfile @@ -37,7 +37,7 @@ RUN curl --fail --location --retry 3 "https://go.dev/dl/go${GO_VERSION}.linux-am # Install Golang Tools (versions match backend/Dockerfile and backend/Makefile) RUN export GOPATH=/go && \ - go install github.com/vektra/mockery/v3@v3.8.1 && \ + go install github.com/vektra/mockery/v3@v3.9.0 && \ go install github.com/swaggo/swag/cmd/swag@v1.16.6 # Golang Env