Skip to content

Commit 7a9fea8

Browse files
authored
Merge pull request #281 from platformsh/hotfix/mod-tidy
Fix go mod tidy checks
2 parents e42e1c9 + 8004845 commit 7a9fea8

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
uses: actions/checkout@v4
1919

2020
- name: Setup Go
21-
uses: actions/setup-go@v5
21+
uses: actions/setup-go@v6
2222
with:
23-
go-version: 1.25
23+
go-version-file: ./go.mod
2424

2525
- name: Create fake PHP and .phar files
2626
run: |

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,7 @@ lint: lint-gomod lint-golangci ## Run linters.
9797

9898
.PHONY: lint-gomod
9999
lint-gomod:
100-
ifneq ($(shell go mod tidy -v 2>/dev/stdout | tee /dev/stderr | grep -c 'unused '),0)
101-
@false
102-
endif
100+
go mod tidy -diff
103101

104102
.PHONY: lint-golangci
105103
lint-golangci:

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,6 @@ github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
280280
github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
281281
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
282282
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
283-
github.com/platformsh/platformify v0.4.1 h1:SJCcCDjIF13KVUNdZtm3SC1uy6iWFhtvJIljqAuIbXQ=
284-
github.com/platformsh/platformify v0.4.1/go.mod h1:fgmCcfQfHbhe1oXsIdIhpnniyZu8IdIMOlcBAa/ygic=
285283
github.com/platformsh/platformify v0.4.2 h1:1qrU86HyF+h5V5Jfw5QugavriEq0t5nWvTqHi39tBXQ=
286284
github.com/platformsh/platformify v0.4.2/go.mod h1:fgmCcfQfHbhe1oXsIdIhpnniyZu8IdIMOlcBAa/ygic=
287285
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

0 commit comments

Comments
 (0)