Merge branch 'main' into dependabot/github_actions/docker/login-action-3

TUM-Dev · Oct 1, 2023 · ddac947 · ddac947
2 parents 2b343fd + 98c6fdc
commit ddac947
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -30,10 +30,10 @@ repos:
         language: system
         pass_filenames: false
         stages: [commit]
-      - id: go-mod-tidy-client
-        name: Check if go.mod and go.sum are up to date for server
-        files: server/
-        entry: sh -c "(cd client && go get github.com/TUM-Dev/Campus-Backend/server && go mod tidy)"
-        language: system
-        pass_filenames: false
-        stages: [commit]
+      #- id: go-mod-tidy-client
+      #  name: Check if go.mod and go.sum are up to date for server
+      #  files: server/
+      #  entry: sh -c "(cd client && go get github.com/TUM-Dev/Campus-Backend/server && go mod tidy)"
+      #  language: system
+      #  pass_filenames: false
+      #  stages: [commit]
diff --git a/client/go.mod b/client/go.mod
@@ -3,7 +3,7 @@ module github.com/TUM-Dev/Campus-Backend/client
 go 1.21
 
 require (
-	github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230922140200-2092d9ee26fb
+	github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230930202539-cc909730b13d
 	github.com/sirupsen/logrus v1.9.3
 	google.golang.org/grpc v1.58.1
 )

diff --git a/client/go.sum b/client/go.sum
@@ -1,5 +1,5 @@
-github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230922140200-2092d9ee26fb h1:zCxXbWPCo1z6+CadxETHfjcGWlgQQN55S3voe2PLXsQ=
-github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230922140200-2092d9ee26fb/go.mod h1:FIIdW5aglREN0ULXZXDQtvuBdbTMa/fCrKSTS8FYP7k=
+github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230930202539-cc909730b13d h1:lGv6MEIHYsKX7hqb1iwZmQujCDmHD9UU474tg2VBWfI=
+github.com/TUM-Dev/Campus-Backend/server v0.0.0-20230930202539-cc909730b13d/go.mod h1:FIIdW5aglREN0ULXZXDQtvuBdbTMa/fCrKSTS8FYP7k=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=