Update to Go 1.22.0

IngmarStein · Mar 26, 2024 · 3e0ede0 · 3e0ede0
1 parent 555d7dc
commit 3e0ede0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -8,7 +8,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.6
+          go-version: 1.22.0
 
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ingmarstein/miele-go
 
-go 1.21
+go 1.22
 
 require (
 	github.com/golang/protobuf v1.5.3 // indirect
@@ -9,4 +9,10 @@ require (
 	google.golang.org/appengine v1.6.8 // indirect
 )
 
+<<<<<<< HEAD
 require google.golang.org/protobuf v1.33.0 // indirect
+||||||| parent of 6a1969b (Update to Go 1.22.0)
+require google.golang.org/protobuf v1.31.0 // indirect
+=======
+require google.golang.org/protobuf v1.32.0 // indirect
+>>>>>>> 6a1969b (Update to Go 1.22.0)
diff --git a/go.sum b/go.sum
@@ -39,5 +39,13 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs
 google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+<<<<<<< HEAD
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+||||||| parent of 6a1969b (Update to Go 1.22.0)
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+=======
+google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+>>>>>>> 6a1969b (Update to Go 1.22.0)