(misc) Update dependencies and move to go 1.21

Signed-off-by: R.I.Pienaar <[email protected]>
choria-io · Feb 7, 2024 · 3e48269 · 3e48269
1 parent af5f240
commit 3e48269
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 40 deletions.
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -5,7 +5,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go: ["1.20"]
+        go: ["1.22"]
 
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -5,7 +5,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go: ["1.20", "1.21"]
+        go: ["1.21", "1.22"]
 
     runs-on: ubuntu-latest
     steps:

diff --git a/ABTaskFile b/ABTaskFile
@@ -23,19 +23,19 @@ commands:
               default: "true"
           script: |
             . "{{ BashHelperPath }}"
-            
+
             ab_announce Updating all dependencies
             echo
-            
-            {{ if eq .Flags.proxy false }}  
+
+            {{ if eq .Flags.proxy false }}
             export GOPROXY=direct
             ab_say Disabling go mod proxy
             {{ end }}
 
             go get -u -n -a -t {{- if .Flags.verbose }} -d -x {{ end }} ./...
 
             ab_say Running go mod tidy
-            
+
             go mod tidy
 
     - name: generate
@@ -104,7 +104,7 @@ commands:
               bool: true
           script: |
             set -e
-            
+
             . "{{ BashHelperPath }}"
 
             {{ if .Flags.update }}
@@ -138,9 +138,9 @@ commands:
               bool: true
           script: |
             set -e
-            
+
             . "{{ BashHelperPath }}"
-                        
+
             {{ if .Flags.update }}
               ab_say Updating linting tools
               go install github.com/client9/misspell/cmd/misspell@latest
@@ -149,22 +149,22 @@ commands:
               echo ">>> Run with --update to install required commands"
               echo
             {{ end }}
-            
+
             ab_say Formatting source files
             go fmt ./...
-            
+
             ab_say Tidying go mod
             go mod tidy
 
             ab_say Checking spelling
             find . -type f -name "*.go" | xargs misspell -error -locale US -i flavour
             find docs/content -type f -name "*.md" | xargs misspell -error -locale US
-            
+
             {{ if .Flags.vet }}
             ab_say Performing go vet
             go vet ./...
             {{ end }}
-            
+
             {{ if .Flags.staticcheck }}
             ab_say Running staticcheck
             staticcheck ./...
@@ -219,9 +219,9 @@ commands:
               short: v
           script: |
             set -e
-            
+
             . "{{ BashHelperPath }}"
-            
+
             {{ if eq .Flags.target "linux/amd64" }}
                 export GOOS=linux
                 export GOARCH=amd64
@@ -240,7 +240,7 @@ commands:
                 " -o go-choria
 
             ab_say Build completed
-            
+
             echo
             ls -l go-choria
             echo

diff --git a/Rakefile b/Rakefile
@@ -14,7 +14,7 @@ task :build do
   build = ENV["BUILD"] || "foss"
   packages = (ENV["PACKAGES"] || "").split(",")
   packages = ["el7_64", "el8_64", "bullseye_64"] if packages.empty?
-  go_version = ENV["GOVERSION"] || "1.18"
+  go_version = ENV["GOVERSION"] || "1.21"
 
   source = "/go/src/github.com/choria-io/go-choria"
 
@@ -52,7 +52,7 @@ task :build_binaries do
 
   source = "/go/src/github.com/choria-io/go-choria"
 
-  sh 'docker run --rm  -v `pwd`:%s -e SOURCE_DIR=%s -e ARTIFACTS=%s -e SHA1="%s" -e BUILD="%s" -e VERSION="%s" -e BINARY_ONLY=1 registry.choria.io/choria/packager:el7-go1.18' % [
+  sh 'docker run --rm  -v `pwd`:%s -e SOURCE_DIR=%s -e ARTIFACTS=%s -e SHA1="%s" -e BUILD="%s" -e VERSION="%s" -e BINARY_ONLY=1 registry.choria.io/choria/packager:el7-go1.21' % [
     source,
     source,
     source,

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/choria-io/go-choria
 
-go 1.20
+go 1.21
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
@@ -94,7 +94,7 @@ require (
 	github.com/itchyny/timefmt-go v0.1.5 // indirect
 	github.com/jedib0t/go-pretty/v6 v6.5.4 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.5 // indirect
+	github.com/klauspost/compress v1.17.6 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -132,15 +132,15 @@ require (
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xiam/to v0.0.0-20200126224905-d60d31e03561 // indirect
 	github.com/yashtewari/glob-intersection v0.2.0 // indirect
-	go.opentelemetry.io/otel v1.22.0 // indirect
-	go.opentelemetry.io/otel/metric v1.22.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.22.0 // indirect
-	go.opentelemetry.io/otel/trace v1.22.0 // indirect
+	go.opentelemetry.io/otel v1.23.0 // indirect
+	go.opentelemetry.io/otel/metric v1.23.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.23.0 // indirect
+	go.opentelemetry.io/otel/trace v1.23.0 // indirect
 	go.uber.org/goleak v1.2.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
-	golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
-	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect
+	golang.org/x/mod v0.15.0 // indirect
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	gonum.org/v1/gonum v0.12.0 // indirect