From d547c39a164a7de0c7d2dee800f565313a6c53a6 Mon Sep 17 00:00:00 2001 From: James Shubin Date: Tue, 16 Aug 2022 19:30:20 -0400 Subject: [PATCH] misc, docs: Move to golang 1.17 There are a few small source fixes and other tidbits to move past 1.16, but we can do those later. --- .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 23c6dee8..1d4ea2db 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.17.x and tip + # TODO: add 1.18.x and tip # minimum required and latest published go_version - - 1.16 + - 1.17 test_block: - basic - shell diff --git a/.travis.yml b/.travis.yml index 0ae6251b..56396a1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,21 +24,21 @@ install: 'make deps' matrix: fast_finish: false allow_failures: - - go: 1.17.x + - go: 1.18.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.16.x + go: 1.17.x env: TEST_BLOCK=basic - name: "shell tests" - go: 1.16.x + go: 1.17.x env: TEST_BLOCK=shell - name: "race tests" - go: 1.16.x + go: 1.17.x env: TEST_BLOCK=race - - go: 1.17.x + - go: 1.18.x - go: tip - os: osx script: 'TEST_BLOCK="$TEST_BLOCK" make test' diff --git a/docker/Dockerfile b/docker/Dockerfile index af80a9b5..b07a82a0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16 +FROM golang:1.17 MAINTAINER Michał Czeraszkiewicz diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build index a863029d..567468ef 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.16.8.linux-amd64.tar.gz https://storage.googleapis.com/golang/go1.16.8.linux-amd64.tar.gz && tar -C /usr/local -xzf /opt/go1.16.8.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.17.13.linux-amd64.tar.gz https://storage.googleapis.com/golang/go1.17.13.linux-amd64.tar.gz && tar -C /usr/local -xzf /opt/go1.17.13.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 d4bd8d0e..980a1c46 100644 --- a/docker/Dockerfile.development +++ b/docker/Dockerfile.development @@ -1,4 +1,4 @@ -FROM golang:1.16 +FROM golang:1.17 MAINTAINER Michał Czeraszkiewicz diff --git a/docs/development.md b/docs/development.md index cf424d55..99660457 100644 --- a/docs/development.md +++ b/docs/development.md @@ -28,7 +28,7 @@ required for running the _test_ suite. ### Build -* `golang` 1.16 or higher (required, available in some distros and distributed +* `golang` 1.17 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 6bd1c90b..eb7f4350 100644 --- 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.16 or greater installed. +* You need golang version 1.17 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 1570ffd3..2e4d9bca 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/purpleidea/mgmt -go 1.16 +go 1.17 require ( cloud.google.com/go v0.54.0 // indirect