Skip to content

Commit

Permalink
housekeeping: update to go 1.22 (#2952)
Browse files Browse the repository at this point in the history
  • Loading branch information
scarlettperry committed Mar 13, 2024
1 parent b3178ac commit 22921ed
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: 1.21.x
go-version: 1.22.x
- name: Set up Node
uses: actions/setup-node@v3
with:
Expand All @@ -36,6 +36,6 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: 1.21.x
go-version: 1.22.x
- name: lint
run: make api-lint
10 changes: 7 additions & 3 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/setup-go@v3
id: setup-go
with:
go-version: 1.21.x
go-version: 1.22.x
- name: go mod cache
uses: actions/cache@v4
with:
Expand All @@ -44,7 +44,7 @@ jobs:
- uses: actions/setup-go@v3
id: setup-go
with:
go-version: 1.21.x
go-version: 1.22.x
- name: go mod cache
uses: actions/cache@v4
with:
Expand All @@ -69,6 +69,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
id: setup-go
with:
go-version: 1.22.x
- run: make backend-integration-test
lint:
runs-on: ubuntu-latest
Expand All @@ -77,7 +81,7 @@ jobs:
- uses: actions/setup-go@v3
id: setup-go
with:
go-version: 1.21.x
go-version: 1.22.x
- name: go mod cache
uses: actions/cache@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- uses: actions/setup-go@v3
id: setup-go
with:
go-version: 1.21.x
go-version: 1.22.x
- uses: actions/setup-node@v3
with:
node-version: '16.x'
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/license_review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ jobs:
working-directory: ./tools/license-finder
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
id: setup-go
with:
go-version: 1.22.x
- name: Install Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scaffolding.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
path: ${{ env.PACKAGEPATH }}
- uses: actions/setup-go@v3
with:
go-version: 1.21.x
go-version: 1.22.x
- uses: actions/setup-node@v3
with:
node-version: '16.x'
Expand Down
2 changes: 1 addition & 1 deletion backend/gateway/gateway_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func TestGetStatsReporterConfiguration(t *testing.T) {
{
cfg: &gatewayv1.Config{Gateway: &gatewayv1.GatewayOptions{
Stats: &gatewayv1.Stats{
Reporter: &gatewayv1.Stats_PrometheusReporter_{PrometheusReporter: &gatewayv1.Stats_PrometheusReporter{HandlerPath: "foo"}},
Reporter: &gatewayv1.Stats_PrometheusReporter_{PrometheusReporter: &gatewayv1.Stats_PrometheusReporter{HandlerPath: "foo.com/path"}},
},
}},
prefix: "clutch",
Expand Down
2 changes: 1 addition & 1 deletion backend/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/lyft/clutch/backend

go 1.21
go 1.22

require (
github.com/DATA-DOG/go-sqlmock v1.5.0
Expand Down
2 changes: 1 addition & 1 deletion docs/_website/generator/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/lyft/clutch/docs/website/generator

go 1.21
go 1.22

require (
github.com/Masterminds/sprig/v3 v3.2.3
Expand Down
2 changes: 1 addition & 1 deletion tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/lyft/clutch/tools

go 1.21
go 1.22
6 changes: 3 additions & 3 deletions tools/golangci-lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ BUILD_ROOT="${REPO_ROOT}/build"
BUILD_BIN="${BUILD_ROOT}/bin"

NAME=golangci-lint
RELEASE=v1.55.2
OSX_RELEASE_256=632e96e6d5294fbbe7b2c410a49c8fa01c60712a0af85a567de85bcc1623ea21
LINUX_RELEASE_256=ca21c961a33be3bc15e4292dc40c98c8dcc5463a7b6768a3afc123761630c09c
RELEASE=v1.56.1
OSX_RELEASE_256=62f02d4c0e8f6f8c77e787b8f271cdd1535eb7d2a28742e2535608652271018e
LINUX_RELEASE_256=aaf8260c76530f7571c49a7bc34b2ecd15accac21106710d47463a2313f1f663

ARCH=amd64

Expand Down
2 changes: 1 addition & 1 deletion tools/scaffolding/templates/gateway/backend/go.mod.tmpl
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module {{ .RepoProvider }}/{{ .RepoOwner }}/{{ .RepoName }}/backend

go 1.21
go 1.22

0 comments on commit 22921ed

Please sign in to comment.