Skip to content

Commit 1ae7a5e

Browse files
authored
Merge pull request #506 from Clever/INFRANG-6876-downgrade-submods
[INFRANG-6876] Downgrade submodules and code gen to 1.21 until WAG service upgrade is complete
2 parents 2b9d7bc + 0a3a7fa commit 1ae7a5e

File tree

26 files changed

+32
-26
lines changed

26 files changed

+32
-26
lines changed

.circleci/config.yml

+3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ jobs:
3131
# Many of these may be bad tests, but we need to investigate.
3232
# Please run tests locally before merging.
3333
# - run: make test
34+
- run:
35+
name: vet
36+
command: go vet -mod=readonly $(go list ./...)
3437
- run: if [ "${CIRCLE_BRANCH}" == "master" ]; then make release && $HOME/ci-scripts/circleci/submodule-github-release $GH_RELEASE_TOKEN clientconfig; fi;
3538
- run: if [ "${CIRCLE_BRANCH}" == "master" ]; then make release && $HOME/ci-scripts/circleci/submodule-github-release $GH_RELEASE_TOKEN logging/wagclientlogger; fi;
3639
- run: if [ "${CIRCLE_BRANCH}" == "master" ]; then make release && $HOME/ci-scripts/circleci/github-release $GH_RELEASE_TOKEN release; fi;

VERSION

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
v9.7.0
2-
Go 1.24 upgrade
1+
v9.7.1
2+
Downgrade generated modules and submodules to 1.21 until every wag service is upgraded
33

44
Previously:
55

6+
v9.7.0
7+
Go 1.24 upgrade
8+
69
v9.6.0
710
remove hystrix-go dependency from wag go clients, fix some tests.
811

clientconfig/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/Clever/wag/clientconfig/v9
22

3-
go 1.24
3+
go 1.21
44

55
require (
66
github.com/Clever/kayvee-go/v7 v7.7.0

clients/go/gengo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ func CreateModFile(path string, basePath string, codeTemplate clientCodeTemplate
207207
modFileString := `
208208
module ` + codeTemplate.ModuleName + codeTemplate.OutputPath + `/client` + codeTemplate.VersionSuffix + `
209209
210-
go 1.24
210+
go 1.21
211211
212212
require (
213213
github.com/Clever/discovery-go v1.8.1

logging/wagclientlogger/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module github.com/Clever/wag/logging/wagclientlogger
22

3-
go 1.24
3+
go 1.21

models/genmodels.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func CreateModFile(path string, basePath, packageName, outputPath string) error
7373
module ` + moduleName + outputPath + `/models` + versionSuffix + `
7474
7575
76-
go 1.24
76+
go 1.21
7777
7878
require (
7979
github.com/go-openapi/errors v0.20.2

samples/gen-go-basic/client/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-basic/models/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-blog/client/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-blog/models/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-client-only/client/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-client-only/models/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-db-custom-path/client/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-db-custom-path/models/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-db-only/models/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-db/client/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-db/models/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-deprecated/client/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-deprecated/models/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-errors/client/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-errors/models/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-nils/client/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-nils/models/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-strings/client/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/gen-go-strings/models/go.mod

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tracing/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/Clever/wag/tracing
22

3-
go 1.24
3+
go 1.21
44

55
require (
66
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.2 // indirect

0 commit comments

Comments
 (0)