diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45d606a6..3054d564 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,9 +18,9 @@ jobs: uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: - go-version: 1.25 + go-version-file: ./go.mod - name: Create fake PHP and .phar files run: | diff --git a/Makefile b/Makefile index fb9d0464..80e15a54 100644 --- a/Makefile +++ b/Makefile @@ -97,9 +97,7 @@ lint: lint-gomod lint-golangci ## Run linters. .PHONY: lint-gomod lint-gomod: -ifneq ($(shell go mod tidy -v 2>/dev/stdout | tee /dev/stderr | grep -c 'unused '),0) - @false -endif + go mod tidy -diff .PHONY: lint-golangci lint-golangci: diff --git a/go.sum b/go.sum index 1e72946e..da5c35b1 100644 --- a/go.sum +++ b/go.sum @@ -280,8 +280,6 @@ github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4= github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/platformsh/platformify v0.4.1 h1:SJCcCDjIF13KVUNdZtm3SC1uy6iWFhtvJIljqAuIbXQ= -github.com/platformsh/platformify v0.4.1/go.mod h1:fgmCcfQfHbhe1oXsIdIhpnniyZu8IdIMOlcBAa/ygic= github.com/platformsh/platformify v0.4.2 h1:1qrU86HyF+h5V5Jfw5QugavriEq0t5nWvTqHi39tBXQ= github.com/platformsh/platformify v0.4.2/go.mod h1:fgmCcfQfHbhe1oXsIdIhpnniyZu8IdIMOlcBAa/ygic= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=