Skip to content

Commit fe2313c

Browse files
committed
misc: Move to golang 1.20
1 parent 271a94e commit fe2313c

9 files changed

+15
-15
lines changed

.github/workflows/test.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
# macos tests are currently failing in CI
2828
#- macos-latest
2929
golang_version:
30-
# TODO: add 1.20.x and tip
30+
# TODO: add 1.21.x and tip
3131
# minimum required and latest published go_version
32-
- 1.19
32+
- 1.20
3333
test_block:
3434
- basic
3535
- shell

.travis.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@ install: 'make deps'
2424
matrix:
2525
fast_finish: false
2626
allow_failures:
27-
- go: 1.20.x
27+
- go: 1.21.x
2828
- go: tip
2929
- os: osx
3030
# include only one build for osx for a quicker build as the nr. of these runners are sparse
3131
include:
3232
- name: "basic tests"
33-
go: 1.19.x
33+
go: 1.20.x
3434
env: TEST_BLOCK=basic
3535
- name: "shell tests"
36-
go: 1.19.x
36+
go: 1.20.x
3737
env: TEST_BLOCK=shell
3838
- name: "race tests"
39-
go: 1.19.x
39+
go: 1.20.x
4040
env: TEST_BLOCK=race
41-
- go: 1.20.x
41+
- go: 1.21.x
4242
- go: tip
4343
- os: osx
4444
script: 'TEST_BLOCK="$TEST_BLOCK" make test'

docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.19
1+
FROM golang:1.20
22

33
MAINTAINER Michał Czeraszkiewicz <[email protected]>
44

docker/Dockerfile.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ENV PATH=/opt/rh/rh-ruby22/root/usr/bin:/root/gopath/bin:/usr/local/sbin:/sbin:/
66
ENV LD_LIBRARY_PATH=/opt/rh/rh-ruby22/root/usr/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
77
ENV PKG_CONFIG_PATH=/opt/rh/rh-ruby22/root/usr/lib64/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}
88

9-
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.19.12.linux-amd64.tar.gz https://storage.googleapis.com/golang/go1.19.12.linux-amd64.tar.gz && tar -C /usr/local -xzf /opt/go1.19.12.linux-amd64.tar.gz
9+
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
1010
RUN mkdir -p $GOPATH/src/github.com/purpleidea && cd $GOPATH/src/github.com/purpleidea && git clone --recursive https://github.com/purpleidea/mgmt
1111
RUN go get -u gopkg.in/alecthomas/gometalinter.v1 && cd $GOPATH/src/github.com/purpleidea/mgmt && make deps && make build
1212
CMD ["/bin/bash"]

docker/Dockerfile.development

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.19
1+
FROM golang:1.20
22

33
MAINTAINER Michał Czeraszkiewicz <[email protected]>
44

docs/development.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ required for running the _test_ suite.
2828

2929
### Build
3030

31-
* `golang` 1.19 or higher (required, available in some distros and distributed
31+
* `golang` 1.20 or higher (required, available in some distros and distributed
3232
as a binary officially by [golang.org](https://golang.org/dl/))
3333

3434
### Runtime

docs/quick-start-guide.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ You'll need some dependencies, including `golang`, and some associated tools.
3939

4040
#### Installing golang
4141

42-
* You need golang version 1.19 or greater installed.
42+
* You need golang version 1.20 or greater installed.
4343
* To install on rpm style systems: `sudo dnf install golang`
4444
* To install on apt style systems: `sudo apt install golang`
4545
* To install on macOS systems install [Homebrew](https://brew.sh)

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/purpleidea/mgmt
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/aws/aws-sdk-go v1.48.5

misc/make-deps.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ BREW=`command -v brew 2>/dev/null`
1717
PACMAN=`command -v pacman 2>/dev/null`
1818

1919
# set minimum golang version and installed golang version
20-
mingolangversion=16
20+
mingolangversion=20
2121
golangversion=0
2222
if [ -x "$GO" ]; then
2323
# capture the minor version number
@@ -143,7 +143,7 @@ fi
143143

144144
# if golang is too old, we don't want to fail with an obscure error later
145145
if [ "$golangversion" -lt "$mingolangversion" ]; then
146-
echo "mgmt recommends go1.$mingolangversion or higher."
146+
echo "mgmt recommends golang 1.$mingolangversion or higher."
147147
exit 1
148148
fi
149149

0 commit comments

Comments
 (0)