Skip to content

Commit 7fb7459

Browse files
authored
Merge pull request #932 from starius/fix-ci
Fix CI
2 parents 49aef8a + 809586c commit 7fb7459

File tree

9 files changed

+97
-2659
lines changed

9 files changed

+97
-2659
lines changed

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,11 @@ mod-tidy:
135135

136136
mod-check:
137137
@$(call print, "Checking modules.")
138-
$(GOMOD) tidy
139-
if test -n "$$(git status | grep -e "go.mod\|go.sum")"; then echo "Running go mod tidy changes go.mod/go.sum"; git status; git diff; exit 1; fi
138+
GOPROXY=direct $(GOMOD) tidy
139+
cd swapserverrpc/ && GOPROXY=direct $(GOMOD) tidy
140+
cd looprpc/ && GOPROXY=direct $(GOMOD) tidy
141+
cd tools/ && GOPROXY=direct $(GOMOD) tidy
142+
if test -n "$$(git status --porcelain)"; then echo "Running go mod tidy changes go.mod/go.sum"; git status; git diff; exit 1; fi
140143

141144
sqlc:
142145
@$(call print, "Generating sql models and queries in Go")

go.sum

Lines changed: 0 additions & 1069 deletions
Large diffs are not rendered by default.

swapserverrpc/common.pb.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swapserverrpc/go.mod

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,12 @@ require (
55
google.golang.org/protobuf v1.34.2
66
)
77

8-
go 1.16
8+
require (
9+
github.com/golang/protobuf v1.5.3 // indirect
10+
golang.org/x/net v0.9.0 // indirect
11+
golang.org/x/sys v0.7.0 // indirect
12+
golang.org/x/text v0.9.0 // indirect
13+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
14+
)
15+
16+
go 1.18

swapserverrpc/go.sum

Lines changed: 0 additions & 1504 deletions
Large diffs are not rendered by default.

swapserverrpc/instantout.pb.go

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

swapserverrpc/reservation.pb.go

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)