From 4fd30b69ee2b62cf3bbecf0a423f8a1ee47f5f24 Mon Sep 17 00:00:00 2001 From: Unai Martinez-Corral <38422348+umarcor@users.noreply.github.com> Date: Thu, 26 Aug 2021 04:18:53 +0100 Subject: [PATCH] ci: test golang 1.16.x and 1.17.x too (#1425) * ci: test golang 1.16.x too * ci: style * ci: test golang 1.17.x too * bump go.mod to 1.15 * run gofmt --- .github/workflows/Test.yml | 22 ++++++++++++++-------- command_notwin.go | 1 + command_win.go | 1 + go.mod | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index c34c2fbbe..bc748030e 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -18,29 +18,35 @@ jobs: - ubuntu - macOS go: - - 1.14.x - - 1.15.x - name: '${{ matrix.platform }} | ${{ matrix.go }}' + - 14 + - 15 + - 16 + - 17 + name: '${{ matrix.platform }} | 1.${{ matrix.go }}.x' runs-on: ${{ matrix.platform }}-latest steps: - uses: actions/setup-go@v2 with: - go-version: ${{ matrix.go }} + go-version: 1.${{ matrix.go }}.x - uses: actions/checkout@v2 - uses: actions/cache@v2 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-${{ matrix.go }}-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-${{ matrix.go }}- + key: ${{ runner.os }}-1.${{ matrix.go }}.x-${{ hashFiles('**/go.sum') }} + restore-keys: ${{ runner.os }}-1.${{ matrix.go }}.x- - run: | export GOBIN=$HOME/go/bin curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | bash -s -- -b $GOBIN latest - go install github.com/kyoh86/richgo - go install github.com/mitchellh/gox + case "${{ matrix.go }}" in + 16|17) _version='@latest';; + *) _version='';; + esac + go install github.com/kyoh86/richgo"${_version}" + go install github.com/mitchellh/gox"${_version}" - run: PATH=$HOME/go/bin/:$PATH make diff --git a/command_notwin.go b/command_notwin.go index 6159c1cc1..bb5dad90b 100644 --- a/command_notwin.go +++ b/command_notwin.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package cobra diff --git a/command_win.go b/command_win.go index 8768b1736..a84f5a82a 100644 --- a/command_win.go +++ b/command_win.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package cobra diff --git a/go.mod b/go.mod index b4c870e88..97eab3c9c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/spf13/cobra -go 1.14 +go 1.15 require ( github.com/cpuguy83/go-md2man/v2 v2.0.1