go: bump to 1.14

The oldest distros we support are Fedora 32 and RHEL 8.3. As both have
Go 1.14, we're safe to upgrade.

Also, I had to change prepare-source.sh because go fmt now refuses to run on
a project which has issues in go.mod, go.sum or modules.text. I think this
should be a harmless change.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-01-29 09:25:16 +01:00 committed by Ondřej Budai
parent 2241a8d9ed
commit f2318f8c5f
5 changed files with 33 additions and 9 deletions

View file

@ -16,10 +16,10 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Set up Go 1.13
- name: Set up Go 1.14
uses: actions/setup-go@v1
with:
go-version: 1.13
go-version: 1.14
id: go
- name: Check out code into the Go module directory

View file

@ -50,7 +50,7 @@ The requirements for this project are:
At build-time, the following software is required:
* `go >= 1.13`
* `go >= 1.14`
* `python-docutils >= 0.13`
### Build

2
go.mod
View file

@ -1,6 +1,6 @@
module github.com/osbuild/osbuild-composer
go 1.13
go 1.14
require (
github.com/Azure/azure-sdk-for-go v41.3.0+incompatible

View file

@ -2,7 +2,7 @@
set -eux
GO_VERSION=1.13.15
GO_VERSION=1.14.14
GO_BINARY=$(go env GOPATH)/bin/go$GO_VERSION
# this is the official way to get a different version of golang
@ -10,12 +10,12 @@ GO_BINARY=$(go env GOPATH)/bin/go$GO_VERSION
go get golang.org/dl/go$GO_VERSION
$GO_BINARY download
# ensure that the code is formatted correctly, ...
$GO_BINARY fmt ./...
# ... go.mod and go.sum are up to date, ...
# ensure that go.mod and go.sum are up to date, ...
$GO_BINARY mod tidy
$GO_BINARY mod vendor
# ... the code is formatted correctly, ...
$GO_BINARY fmt ./...
# ... and all code has been regenerated from its sources.
$GO_BINARY generate ./...

24
vendor/modules.txt vendored
View file

@ -1,35 +1,43 @@
# github.com/Azure/azure-pipeline-go v0.2.3
github.com/Azure/azure-pipeline-go/pipeline
# github.com/Azure/azure-sdk-for-go v41.3.0+incompatible
## explicit
github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network
github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-05-01/resources
github.com/Azure/azure-sdk-for-go/version
# github.com/Azure/azure-storage-blob-go v0.11.1-0.20201209121048-6df5d9af221d
## explicit
github.com/Azure/azure-storage-blob-go/azblob
# github.com/Azure/go-autorest v14.2.0+incompatible
github.com/Azure/go-autorest
# github.com/Azure/go-autorest/autorest v0.10.0
## explicit
github.com/Azure/go-autorest/autorest
github.com/Azure/go-autorest/autorest/azure
# github.com/Azure/go-autorest/autorest/adal v0.9.2
github.com/Azure/go-autorest/autorest/adal
# github.com/Azure/go-autorest/autorest/azure/auth v0.4.2
## explicit
github.com/Azure/go-autorest/autorest/azure/auth
# github.com/Azure/go-autorest/autorest/azure/cli v0.3.1
github.com/Azure/go-autorest/autorest/azure/cli
# github.com/Azure/go-autorest/autorest/date v0.3.0
github.com/Azure/go-autorest/autorest/date
# github.com/Azure/go-autorest/autorest/to v0.3.0
## explicit
github.com/Azure/go-autorest/autorest/to
# github.com/Azure/go-autorest/autorest/validation v0.2.0
## explicit
github.com/Azure/go-autorest/autorest/validation
# github.com/Azure/go-autorest/logger v0.1.0
github.com/Azure/go-autorest/logger
# github.com/Azure/go-autorest/tracing v0.6.0
github.com/Azure/go-autorest/tracing
# github.com/BurntSushi/toml v0.3.1
## explicit
github.com/BurntSushi/toml
# github.com/aws/aws-sdk-go v1.25.37
## explicit
github.com/aws/aws-sdk-go/aws
github.com/aws/aws-sdk-go/aws/awserr
github.com/aws/aws-sdk-go/aws/awsutil
@ -72,12 +80,15 @@ github.com/aws/aws-sdk-go/service/s3/s3manager
github.com/aws/aws-sdk-go/service/sts
github.com/aws/aws-sdk-go/service/sts/stsiface
# github.com/coreos/go-semver v0.3.0
## explicit
github.com/coreos/go-semver/semver
# github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
## explicit
github.com/coreos/go-systemd/activation
# github.com/davecgh/go-spew v1.1.1
github.com/davecgh/go-spew/spew
# github.com/deepmap/oapi-codegen v1.3.12
## explicit
github.com/deepmap/oapi-codegen/cmd/oapi-codegen
github.com/deepmap/oapi-codegen/pkg/codegen
github.com/deepmap/oapi-codegen/pkg/codegen/templates
@ -94,8 +105,10 @@ github.com/getkin/kin-openapi/openapi3
# github.com/ghodss/yaml v1.0.0
github.com/ghodss/yaml
# github.com/go-chi/chi v4.0.2+incompatible
## explicit
github.com/go-chi/chi
# github.com/gobwas/glob v0.2.3
## explicit
github.com/gobwas/glob
github.com/gobwas/glob/compiler
github.com/gobwas/glob/match
@ -105,14 +118,17 @@ github.com/gobwas/glob/syntax/lexer
github.com/gobwas/glob/util/runes
github.com/gobwas/glob/util/strings
# github.com/google/go-cmp v0.3.1
## explicit
github.com/google/go-cmp/cmp
github.com/google/go-cmp/cmp/internal/diff
github.com/google/go-cmp/cmp/internal/flags
github.com/google/go-cmp/cmp/internal/function
github.com/google/go-cmp/cmp/internal/value
# github.com/google/uuid v1.1.1
## explicit
github.com/google/uuid
# github.com/gophercloud/gophercloud v0.11.0
## explicit
github.com/gophercloud/gophercloud
github.com/gophercloud/gophercloud/internal
github.com/gophercloud/gophercloud/openstack
@ -129,14 +145,17 @@ github.com/gophercloud/gophercloud/pagination
# github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af
github.com/jmespath/go-jmespath
# github.com/julienschmidt/httprouter v1.2.0
## explicit
github.com/julienschmidt/httprouter
# github.com/kolo/xmlrpc v0.0.0-20200310150728-e0350524596b
## explicit
github.com/kolo/xmlrpc
# github.com/kr/pretty v0.1.0
github.com/kr/pretty
# github.com/kr/text v0.1.0
github.com/kr/text
# github.com/labstack/echo/v4 v4.1.11
## explicit
github.com/labstack/echo/v4
# github.com/labstack/gommon v0.3.0
github.com/labstack/gommon/color
@ -154,10 +173,12 @@ github.com/pkg/errors
# github.com/pmezard/go-difflib v1.0.0
github.com/pmezard/go-difflib/difflib
# github.com/stretchr/testify v1.5.1
## explicit
github.com/stretchr/testify/assert
github.com/stretchr/testify/require
github.com/stretchr/testify/suite
# github.com/ubccr/kerby v0.0.0-20170626144437-201a958fc453
## explicit
github.com/ubccr/kerby
github.com/ubccr/kerby/khttp
# github.com/valyala/bytebufferpool v1.0.0
@ -165,6 +186,7 @@ github.com/valyala/bytebufferpool
# github.com/valyala/fasttemplate v1.1.0
github.com/valyala/fasttemplate
# github.com/vmware/govmomi v0.23.0
## explicit
github.com/vmware/govmomi/find
github.com/vmware/govmomi/govc/cli
github.com/vmware/govmomi/govc/datastore
@ -206,9 +228,11 @@ golang.org/x/crypto/acme/autocert
golang.org/x/crypto/pkcs12
golang.org/x/crypto/pkcs12/internal/rc2
# golang.org/x/net v0.0.0-20200202094626-16171245cfb2
## explicit
golang.org/x/net/http/httpproxy
golang.org/x/net/idna
# golang.org/x/sys v0.0.0-20200828194041-157a740278f4
## explicit
golang.org/x/sys/internal/unsafeheader
golang.org/x/sys/unix
golang.org/x/sys/windows