From 90e8e02b0c033996f185d21a1343788307ddec1c Mon Sep 17 00:00:00 2001 From: James Shubin Date: Mon, 7 Aug 2023 23:52:06 -0400 Subject: [PATCH] misc: Move to new golang version --- .github/workflows/test.yaml | 4 ++-- .travis.yml | 10 +++++----- docker/Dockerfile | 2 +- docker/Dockerfile.build | 2 +- docker/Dockerfile.development | 2 +- docs/development.md | 2 +- docs/quick-start-guide.md | 2 +- go.mod | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6de62974..afc258fc 100644 --- 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.19.x and tip + # TODO: add 1.20.x and tip # minimum required and latest published go_version - - 1.18 + - 1.19 test_block: - basic - shell diff --git a/.travis.yml b/.travis.yml index 5ff1ce8b..9ec242a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,21 +24,21 @@ install: 'make deps' matrix: fast_finish: false allow_failures: - - go: 1.19.x + - go: 1.20.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.18.x + go: 1.19.x env: TEST_BLOCK=basic - name: "shell tests" - go: 1.18.x + go: 1.19.x env: TEST_BLOCK=shell - name: "race tests" - go: 1.18.x + go: 1.19.x env: TEST_BLOCK=race - - go: 1.19.x + - go: 1.20.x - go: tip - os: osx script: 'TEST_BLOCK="$TEST_BLOCK" make test' diff --git a/docker/Dockerfile b/docker/Dockerfile index 540a009f..c55c13d8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18 +FROM golang:1.19 MAINTAINER Michał Czeraszkiewicz diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index 6690ba4d..2221faef 100644 --- 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.18.5.linux-amd64.tar.gz https://storage.googleapis.com/golang/go1.18.5.linux-amd64.tar.gz && tar -C /usr/local -xzf /opt/go1.18.5.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.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 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 index 6bd4cf71..256e1d41 100644 --- a/docker/Dockerfile.development +++ b/docker/Dockerfile.development @@ -1,4 +1,4 @@ -FROM golang:1.18 +FROM golang:1.19 MAINTAINER Michał Czeraszkiewicz diff --git a/docs/development.md b/docs/development.md index 8b029a3c..cfacd2a2 100644 --- a/docs/development.md +++ b/docs/development.md @@ -28,7 +28,7 @@ required for running the _test_ suite. ### Build -* `golang` 1.18 or higher (required, available in some distros and distributed +* `golang` 1.19 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 index 384b694f..44f924b9 100644 --- a/docs/quick-start-guide.md +++ b/docs/quick-start-guide.md @@ -39,7 +39,7 @@ You'll need some dependencies, including `golang`, and some associated tools. #### Installing golang -* You need golang version 1.18 or greater installed. +* You need golang version 1.19 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 index 934c35b3..83a73956 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/purpleidea/mgmt -go 1.18 +go 1.19 require ( github.com/aws/aws-sdk-go v1.44.116