Skip to content

Commit

Permalink
Merge pull request #803 from hairyhenderson/test-with-go-1.14
Browse files Browse the repository at this point in the history
use Go 1.14.x in CI
  • Loading branch information
Dave Henderson authored and GitHub committed Apr 10, 2020
2 parents abce277 + e32d37a commit e55907f
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 60 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ jobs:
# image: docker.pkg.github.com/hairyhenderson/dockerfiles/gomplate-ci-build:latest
image: hairyhenderson/gomplate-ci-build:latest
steps:
- uses: actions/setup-go@v1
with:
go-version: 1.13.x
- run: |
git config --global user.email "bogus@example.com"
git config --global user.name "Someone"
Expand All @@ -34,7 +31,7 @@ jobs:
steps:
- uses: actions/setup-go@v1
with:
go-version: 1.13.x
go-version: 1.14.x
- run: |
git config --global user.email "bogus@example.com"
git config --global user.name "Someone"
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/mod-tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v1
- uses: actions/setup-go@v1
with:
go-version: 1.13.x
- name: Reattach HEAD
run: git checkout ${GITHUB_REF#refs/heads/}
- name: Tidy
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ gomplate.png: gomplate.svg
cloudconvert -f png -c density=288 $^

lint:
golangci-lint --version
@golangci-lint run --timeout 2m --disable-all \
--enable depguard \
--enable dupl \
Expand Down
35 changes: 18 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,48 +6,49 @@ require (
cloud.google.com/go/storage v1.6.0 // indirect
github.com/Masterminds/goutils v1.1.0
github.com/Shopify/ejson v1.2.1
github.com/armon/go-metrics v0.3.2 // indirect
github.com/aws/aws-sdk-go v1.29.29
github.com/armon/go-metrics v0.3.3 // indirect
github.com/aws/aws-sdk-go v1.30.7
github.com/boltdb/bolt v1.3.1
github.com/docker/libkv v0.2.1
github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad // indirect
github.com/frankban/quicktest v1.7.3 // indirect
github.com/frankban/quicktest v1.9.0 // indirect
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa
github.com/golang/protobuf v1.3.4 // indirect
github.com/golang/protobuf v1.3.5 // indirect
github.com/google/uuid v1.1.1
github.com/google/wire v0.4.0 // indirect
github.com/gosimple/slug v1.9.0
github.com/hairyhenderson/toml v0.3.1-0.20191004034452-2a4f3b6160f2
github.com/hashicorp/consul/api v1.4.0
github.com/hashicorp/go-immutable-radix v1.1.0 // indirect
github.com/hashicorp/go-retryablehttp v0.6.4 // indirect
github.com/hashicorp/go-immutable-radix v1.2.0 // indirect
github.com/hashicorp/go-retryablehttp v0.6.5 // indirect
github.com/hashicorp/go-sockaddr v1.0.2
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/serf v0.8.5 // indirect
github.com/hashicorp/serf v0.9.0 // indirect
github.com/hashicorp/vault/api v1.0.4
github.com/johannesboyne/gofakes3 v0.0.0-20191228161223-9aee1c78a252
github.com/johannesboyne/gofakes3 v0.0.0-20200218152459-de0855a40bc1
github.com/joho/godotenv v1.3.0
github.com/pierrec/lz4 v2.4.1+incompatible // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/pierrec/lz4 v2.5.0+incompatible // indirect
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.18.0
github.com/sergi/go-diff v1.1.0 // indirect
github.com/smartystreets/goconvey v1.6.4 // indirect
github.com/spf13/afero v1.2.2
github.com/spf13/cobra v0.0.7-0.20200228181340-95f2f73ed97e
github.com/spf13/cobra v0.0.7
github.com/stretchr/testify v1.5.1
github.com/ugorji/go/codec v1.1.7
github.com/zealic/xignore v0.3.3
gocloud.dev v0.19.0
golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b // indirect
golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d // indirect
google.golang.org/api v0.19.0 // indirect
google.golang.org/genproto v0.0.0-20200227132054-3f1135a288c9 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
golang.org/x/crypto v0.0.0-20200406173513-056763e48d71
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
golang.org/x/tools v0.0.0-20200410132612-ae9902aceb98 // indirect
google.golang.org/api v0.21.0 // indirect
google.golang.org/genproto v0.0.0-20200410110633-0848e9f44c36 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f
gopkg.in/square/go-jose.v2 v2.4.1 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.2
gopkg.in/src-d/go-git.v4 v4.13.1
gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
gotest.tools/v3 v3.0.2
k8s.io/client-go v11.0.0+incompatible
)
Loading

0 comments on commit e55907f

Please sign in to comment.