From 75addd95c08eefbfbd10a469a9d7d3f30253e444 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Thu, 19 Sep 2024 12:43:26 +0300 Subject: [PATCH 1/2] ci: fix ci/fmt.sh by pinning versions (#492) --- ci/fmt.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ci/fmt.sh b/ci/fmt.sh index 31d0c15d..e319a1e4 100755 --- a/ci/fmt.sh +++ b/ci/fmt.sh @@ -2,22 +2,24 @@ set -eu cd -- "$(dirname "$0")/.." +# Pin golang.org/x/tools, the go.mod of v0.25.0 is incompatible with Go 1.19. +X_TOOLS_VERSION=v0.24.0 + go mod tidy (cd ./internal/thirdparty && go mod tidy) (cd ./internal/examples && go mod tidy) gofmt -w -s . -go run golang.org/x/tools/cmd/goimports@latest -w "-local=$(go list -m)" . +go run golang.org/x/tools/cmd/goimports@${X_TOOLS_VERSION} -w "-local=$(go list -m)" . -npx prettier@3.0.3 \ - --write \ +git ls-files "*.yml" "*.md" "*.js" "*.css" "*.html" | xargs npx prettier@3.3.3 \ + --check \ --log-level=warn \ --print-width=90 \ --no-semi \ --single-quote \ - --arrow-parens=avoid \ - $(git ls-files "*.yml" "*.md" "*.js" "*.css" "*.html") + --arrow-parens=avoid -go run golang.org/x/tools/cmd/stringer@latest -type=opcode,MessageType,StatusCode -output=stringer.go +go run golang.org/x/tools/cmd/stringer@${X_TOOLS_VERSION} -type=opcode,MessageType,StatusCode -output=stringer.go if [ "${CI-}" ]; then git diff --exit-code From cef8e11d00b0742ad38986fd607da419a507e1cd Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Thu, 19 Sep 2024 12:44:01 +0300 Subject: [PATCH 2/2] chore: remove funding (#493) --- .github/FUNDING.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index fb83c3a9..00000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -github: nhooyr