From fd012ec272b3de322166a9f5e6b69277d0018aad Mon Sep 17 00:00:00 2001 From: Lucas Bremgartner Date: Thu, 12 Sep 2024 20:59:39 +0200 Subject: [PATCH 1/3] Update golang.org/x/tools --- go.mod | 8 +++++--- go.sum | 9 +++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 173adb6..bde03cf 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,12 @@ module github.com/breml/bidichk -go 1.20 +go 1.22.0 -require golang.org/x/tools v0.24.0 +toolchain go1.22.6 + +require golang.org/x/tools v0.25.0 require ( - golang.org/x/mod v0.20.0 // indirect + golang.org/x/mod v0.21.0 // indirect golang.org/x/sync v0.8.0 // indirect ) diff --git a/go.sum b/go.sum index cce3a37..6f1f712 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= +golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= From 50af23d4bccdb324dc62ec102ebf2dc2d9e6747d Mon Sep 17 00:00:00 2001 From: Lucas Bremgartner Date: Thu, 12 Sep 2024 21:03:40 +0200 Subject: [PATCH 2/3] Update go versions for CI --- .github/workflows/deps.yml | 2 +- .github/workflows/go-cross.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml index 91440a2..699ae99 100644 --- a/.github/workflows/deps.yml +++ b/.github/workflows/deps.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: "1.20" + go-version: "stable" - uses: actions/go-dependency-submission@v1 with: go-mod-path: go.mod diff --git a/.github/workflows/go-cross.yml b/.github/workflows/go-cross.yml index f479f8e..71dea8a 100644 --- a/.github/workflows/go-cross.yml +++ b/.github/workflows/go-cross.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: - go-version: [ "1.20", "1.21", "1.x" ] + go-version: [ "stable", "oldstable", "1.x" ] os: [ubuntu-latest, macos-latest, windows-latest] steps: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7a79d2d..f6e9591 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: name: Main Process runs-on: ubuntu-latest env: - GO_VERSION: "1.20" + GO_VERSION: "stable" GOLANGCI_LINT_VERSION: v1.51.2 CGO_ENABLED: 0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8a40e3e..187a87b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.20" + go-version: "stable" - name: Run GoReleaser From 4bfacb6f5397c4bc4e9605fff6281cbc6b865601 Mon Sep 17 00:00:00 2001 From: Lucas Bremgartner Date: Thu, 12 Sep 2024 21:07:34 +0200 Subject: [PATCH 3/3] Update golangci-lint --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f6e9591..2f448b0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest env: GO_VERSION: "stable" - GOLANGCI_LINT_VERSION: v1.51.2 + GOLANGCI_LINT_VERSION: v1.61.0 CGO_ENABLED: 0 steps: