From ba4d3c5b4f11b44445f068c1f7c8544724e77a98 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 7 Sep 2026 08:20:15 +0000 Subject: [PATCH] chore(deps): update dependencies and tweak make checks (#1212) 1. Dependency updates: gobwas/glob v1.0.0, which replaced its `Glob` interface with `*Pattern`, logrus v1.10.2, prometheus/client_model v0.6.3, golangci-lint v2.13.2, Go 1.27.1, docker/setup-qemu-action and nginx digests. 2. `make fmt-check` and `make tidy-check` report only what the formatter or `go mod tidy` would change, so unrelated uncommitted work no longer fails `make checks`. --------- Co-authored-by: silverwind Reviewed-on: https://gitea.com/gitea/runner/pulls/1212 Reviewed-by: silverwind <2021+silverwind@noreply.gitea.com> Co-authored-by: Renovate Bot --- .gitea/workflows/release-nightly.yml | 2 +- .gitea/workflows/release-tag.yml | 2 +- .gitea/workflows/test.yml | 2 +- Makefile | 20 +++++--------------- act/container/docker_run.go | 8 ++++---- go.mod | 8 ++++---- go.sum | 12 ++++++------ 7 files changed, 22 insertions(+), 32 deletions(-) diff --git a/.gitea/workflows/release-nightly.yml b/.gitea/workflows/release-nightly.yml index c406bd37..2548c0cd 100644 --- a/.gitea/workflows/release-nightly.yml +++ b/.gitea/workflows/release-nightly.yml @@ -74,7 +74,7 @@ jobs: fetch-depth: 0 # all history for all branches and tags - name: Set up QEMU - uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4 + uses: docker/setup-qemu-action@1f40c72289eff860ee54a304f1438e3cff362e0a # v4 - name: Set up Docker BuildX uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4 diff --git a/.gitea/workflows/release-tag.yml b/.gitea/workflows/release-tag.yml index 0bc7fe73..0ef9aac6 100644 --- a/.gitea/workflows/release-tag.yml +++ b/.gitea/workflows/release-tag.yml @@ -77,7 +77,7 @@ jobs: fetch-depth: 0 # all history for all branches and tags - name: Set up QEMU - uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4 + uses: docker/setup-qemu-action@1f40c72289eff860ee54a304f1438e3cff362e0a # v4 - name: Set up Docker BuildX uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4 diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 433e4dff..7aeefa17 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -31,7 +31,7 @@ jobs: - name: pre-pull test images env: TEST_JOB_IMAGE: node:24-bookworm-slim@sha256:ba849c60be29959425b8734d57b8b4b7d56f98edd9504c9af091d5281095a71e # renovate: datasource=docker - TEST_SERVICE_IMAGE: nginx:alpine@sha256:db35bfc6b2951e7f8a72db5db120288c127ffaeeb4a6d4b95a26fead017d5913 # renovate: datasource=docker + TEST_SERVICE_IMAGE: nginx:alpine@sha256:72ba65eb42c10344912a84ff42408db7d34f2feb642204570ab8fc5ffd29f1d3 # renovate: datasource=docker run: | for image in "$TEST_JOB_IMAGE" "$TEST_SERVICE_IMAGE"; do for attempt in 1 2 3; do diff --git a/Makefile b/Makefile index 1de78b1f..563f2ff0 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ DOCKER_TAG ?= nightly DOCKER_REF := $(DOCKER_IMAGE):$(DOCKER_TAG) DOCKER_ROOTLESS_REF := $(DOCKER_IMAGE):$(DOCKER_TAG)-dind-rootless -GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.13.1 # renovate: datasource=go +GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.13.2 # renovate: datasource=go GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1.7.0 # renovate: datasource=go GOTEST_FLAGS ?= -race -timeout 20m -parallel 8 @@ -96,13 +96,8 @@ go-check: fi .PHONY: fmt-check -fmt-check: fmt - @diff=$$(git diff --color=always -- '*.go'); \ - if [ -n "$$diff" ]; then \ - echo "Please run 'make fmt' and commit the result:"; \ - printf "%s" "$${diff}"; \ - exit 1; \ - fi +fmt-check: ## check the Go code formatting + $(GO) run $(GOLANGCI_LINT_PACKAGE) fmt --diff-colored .PHONY: deps-tools deps-tools: ## install tool dependencies @@ -149,13 +144,8 @@ tidy: ## run go mod tidy fi .PHONY: tidy-check -tidy-check: tidy - @diff=$$(git diff --color=always -- go.mod go.sum); \ - if [ -n "$$diff" ]; then \ - echo "Please run 'make tidy' and commit the result:"; \ - printf "%s" "$${diff}"; \ - exit 1; \ - fi +tidy-check: ## check that go.mod and go.sum are tidy + $(GO) mod tidy -diff .PHONY: test test: ## test everything (integration tests self-skip without docker/network) diff --git a/act/container/docker_run.go b/act/container/docker_run.go index 6dadb2cb..809f8a80 100644 --- a/act/container/docker_run.go +++ b/act/container/docker_run.go @@ -1277,15 +1277,15 @@ func overlayVolumes(dst, src *container.HostConfig) { type validVolumeMatcher struct { allowAll bool - named []glob.Glob - host []glob.Glob + named []*glob.Pattern + host []*glob.Pattern } func newValidVolumeMatcher(ctx context.Context, validVolumes []string) validVolumeMatcher { logger := common.Logger(ctx) ret := validVolumeMatcher{ - named: make([]glob.Glob, 0, len(validVolumes)), - host: make([]glob.Glob, 0, len(validVolumes)), + named: make([]*glob.Pattern, 0, len(validVolumes)), + host: make([]*glob.Pattern, 0, len(validVolumes)), } for _, v := range validVolumes { diff --git a/go.mod b/go.mod index 269950b3..538c8fd0 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module gitea.com/gitea/runner go 1.27 -toolchain go1.27.0 +toolchain go1.27.1 require ( connectrpc.com/connect v1.20.0 @@ -17,7 +17,7 @@ require ( github.com/docker/go-units v0.5.0 github.com/go-git/go-billy/v5 v5.9.1 github.com/go-git/go-git/v5 v5.19.2 - github.com/gobwas/glob v0.2.3 + github.com/gobwas/glob v1.0.0 github.com/google/go-cmp v0.7.0 github.com/joho/godotenv v1.5.1 github.com/julienschmidt/httprouter v1.3.0 @@ -30,8 +30,8 @@ require ( github.com/opencontainers/image-spec v1.1.1 github.com/opencontainers/selinux v1.15.1 github.com/prometheus/client_golang v1.24.1 - github.com/prometheus/client_model v0.6.2 - github.com/sirupsen/logrus v1.10.1 + github.com/prometheus/client_model v0.6.3 + github.com/sirupsen/logrus v1.10.2 github.com/spf13/cobra v1.10.2 github.com/spf13/pflag v1.0.10 github.com/stretchr/testify v1.12.1 diff --git a/go.sum b/go.sum index d325aa1d..7df3249f 100644 --- a/go.sum +++ b/go.sum @@ -77,8 +77,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.5.0 h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro= github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= -github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= -github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/gobwas/glob v1.0.0 h1:p+FKbLEIsK1yZ39/OINwFvqNb5oyPY4H8xcy6uYu8dg= +github.com/gobwas/glob v1.0.0/go.mod h1:oWCdo522i2P1n/hMXGNWs7yoV4wy/ciZuUIbvKj5rkc= github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= @@ -157,8 +157,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU= github.com/prometheus/client_golang v1.24.1/go.mod h1:F+oSRECHg4sse5ucfYpYDeIv/hu68Zo0uoHKetWnzcE= -github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk= -github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= +github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPTB1qyxiEo= +github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM= github.com/prometheus/common v0.70.1 h1:1HvjP4D5oL3t8RsPlwxA9onvvStjtIHYE5XuuwOi/PY= github.com/prometheus/common v0.70.1/go.mod h1:VdFUQDMZK3VLkurFUVhia6uys/0suUp86TJz5qbJRhc= github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI= @@ -173,8 +173,8 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw= github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.10.1 h1:xi4336Zh11WpU14fXR6I67V3yaTPQYwRx2WEtHbRg4Q= -github.com/sirupsen/logrus v1.10.1/go.mod h1:vsQHnG7xzNsxk3NrwboUiWPnIC3dmbjcGPykD7+tiHk= +github.com/sirupsen/logrus v1.10.2 h1:G2SED73/qrAu6YwbdxOD6peLkCBI3z7L+ykJFTXJBBo= +github.com/sirupsen/logrus v1.10.2/go.mod h1:SLEg8TqYulVKKfIGHldVp2K2aYz2DKSVBq4g/H5bR7Q= github.com/skeema/knownhosts v1.3.2 h1:EDL9mgf4NzwMXCTfaxSD/o/a5fxDw/xL9nkU28JjdBg= github.com/skeema/knownhosts v1.3.2/go.mod h1:bEg3iQAuw+jyiw+484wwFJoKSLwcfd7fqRy+N0QTiow= github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=