misc: Move to golang 1.21

Unfortunately, this also breaks go-mod-upgrade with: upgrade failed error=Error running go command to discover modules: exit status 1 stderr=go: loading module retractions for golang.org/x/[email protected]: version "v0.17.0" invalid: resolves to version v0.17.1-0.20240315155916-aa51b25a4485 (v0.17.0 is not a tag) go: loading module retractions for golang.org/x/[email protected]: version "v0.7.0" invalid: resolves to version v0.7.1-0.20240304172602-14be23e5b48b (v0.7.0 is not a tag)
xlai89 · Apr 25, 2024 · c12452b · c12452b
1 parent 0e92d19
commit c12452b
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 55 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -27,9 +27,9 @@ jobs:
  # macos tests are currently failing in CI
  #- macos-latest
  golang_version:
- # TODO: add 1.21.x and tip
+ # TODO: add 1.22.x and tip
  # minimum required and latest published go_version
- - "1.20"
+ - "1.21"
  test_block:
  - basic
  - shell

diff --git a/.travis.yml b/.travis.yml
@@ -24,21 +24,21 @@ install: 'make deps'
 matrix:
  fast_finish: false
  allow_failures:
- - go: 1.21.x
+ - go: 1.22.x
  - go: tip
  - os: osx
  # include only one build for osx for a quicker build as the nr. of these runners are sparse
  include:
  - name: "basic tests"
- go: 1.20.x
+ go: 1.21.x
  env: TEST_BLOCK=basic
  - name: "shell tests"
- go: 1.20.x
+ go: 1.21.x
  env: TEST_BLOCK=shell
  - name: "race tests"
- go: 1.20.x
+ go: 1.21.x
  env: TEST_BLOCK=race
- - go: 1.21.x
+ - go: 1.22.x
  - go: tip
  - os: osx
 script: 'TEST_BLOCK="$TEST_BLOCK" make test'

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20
+FROM golang:1.21
 
 MAINTAINER Michał Czeraszkiewicz <[email protected]>
 

diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build
@@ -6,7 +6,7 @@ ENV PATH=/opt/rh/rh-ruby22/root/usr/bin:/root/gopath/bin:/usr/local/sbin:/sbin:/
 ENV LD_LIBRARY_PATH=/opt/rh/rh-ruby22/root/usr/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 ENV PKG_CONFIG_PATH=/opt/rh/rh-ruby22/root/usr/lib64/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}
 
-RUN yum -y install epel-release wget unzip git make which centos-release-scl gcc && sed -i "s/enabled=0/enabled=1/" /etc/yum.repos.d/epel-testing.repo && yum -y install rh-ruby22 && wget -O /opt/go1.20.11.linux-amd64.tar.gz https://storage.googleapis.com/golang/go1.20.11.linux-amd64.tar.gz && tar -C /usr/local -xzf /opt/go1.20.11.linux-amd64.tar.gz
+RUN yum -y install epel-release wget unzip git make which centos-release-scl gcc && sed -i "s/enabled=0/enabled=1/" /etc/yum.repos.d/epel-testing.repo && yum -y install rh-ruby22 && wget -O /opt/go1.21.9.linux-amd64.tar.gz https://storage.googleapis.com/golang/go1.21.9.linux-amd64.tar.gz && tar -C /usr/local -xzf /opt/go1.21.9.linux-amd64.tar.gz
 RUN mkdir -p $GOPATH/src/github.com/purpleidea && cd $GOPATH/src/github.com/purpleidea && git clone --recursive https://github.com/purpleidea/mgmt
 RUN go get -u gopkg.in/alecthomas/gometalinter.v1 && cd $GOPATH/src/github.com/purpleidea/mgmt && make deps && make build
 CMD ["/bin/bash"]
diff --git a/docker/Dockerfile.development b/docker/Dockerfile.development
@@ -1,4 +1,4 @@
-FROM golang:1.20
+FROM golang:1.21
 
 MAINTAINER Michał Czeraszkiewicz <[email protected]>
 

diff --git a/docs/development.md b/docs/development.md
@@ -28,7 +28,7 @@ required for running the _test_ suite.
 
 ### Build
 
-* `golang` 1.20 or higher (required, available in some distros and distributed
+* `golang` 1.21 or higher (required, available in some distros and distributed
 as a binary officially by [golang.org](https://golang.org/dl/))
 
 ### Runtime

diff --git a/docs/quick-start-guide.md b/docs/quick-start-guide.md
@@ -37,7 +37,7 @@ You'll need some dependencies, including `golang`, and some associated tools.
 
 #### Installing golang
 
-* You need golang version 1.20 or greater installed.
+* You need golang version 1.21 or greater installed.
  * To install on rpm style systems: `sudo dnf install golang`
  * To install on apt style systems: `sudo apt install golang`
  * To install on macOS systems install [Homebrew](https://brew.sh)

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/purpleidea/mgmt
 
-go 1.20
+go 1.21
 
 require (
  github.com/alexflint/go-arg v1.4.3
@@ -13,6 +13,7 @@ require (
  github.com/docker/docker v25.0.4+incompatible
  github.com/docker/go-connections v0.5.0
  github.com/fsnotify/fsnotify v1.7.0
+ github.com/go-git/go-git/v5 v5.11.0
  github.com/godbus/dbus/v5 v5.1.0
  github.com/google/nftables v0.2.0
  github.com/google/uuid v1.6.0
@@ -37,6 +38,7 @@ require (
  go.etcd.io/etcd/client/pkg/v3 v3.5.12
  go.etcd.io/etcd/client/v3 v3.5.12
  go.etcd.io/etcd/server/v3 v3.5.12
+ go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
  golang.org/x/crypto v0.21.0
  golang.org/x/sys v0.18.0
  golang.org/x/time v0.5.0
@@ -68,7 +70,6 @@ require (
  github.com/felixge/httpsnoop v1.0.4 // indirect
  github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
  github.com/go-git/go-billy/v5 v5.5.0 // indirect
- github.com/go-git/go-git/v5 v5.11.0 // indirect
  github.com/go-logr/logr v1.4.1 // indirect
  github.com/go-logr/stdr v1.2.2 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
@@ -111,6 +112,7 @@ require (
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/morikuni/aec v1.0.0 // indirect
+ github.com/nxadm/tail v1.4.11 // indirect
  github.com/opencontainers/go-digest v1.0.0 // indirect
  github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
  github.com/pierrec/lz4/v4 v4.1.21 // indirect
@@ -147,7 +149,6 @@ require (
  go.uber.org/atomic v1.11.0 // indirect
  go.uber.org/multierr v1.11.0 // indirect
  go.uber.org/zap v1.23.0 // indirect
- go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
  golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
  golang.org/x/mod v0.16.0 // indirect
  golang.org/x/net v0.22.0 // indirect