Skip to content

Commit

Permalink
Update go and all dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
tboerger committed Mar 14, 2021
1 parent 2838f40 commit 6e2b4bc
Show file tree
Hide file tree
Showing 3 changed files with 688 additions and 227 deletions.
52 changes: 31 additions & 21 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def testing(ctx):
'steps': [
{
'name': 'generate',
'image': 'webhippie/golang:1.14',
'image': 'webhippie/golang:1.15',
'pull': 'always',
'commands': [
'make generate',
Expand All @@ -47,7 +47,7 @@ def testing(ctx):
},
{
'name': 'vet',
'image': 'webhippie/golang:1.14',
'image': 'webhippie/golang:1.15',
'pull': 'always',
'commands': [
'make vet',
Expand All @@ -61,7 +61,7 @@ def testing(ctx):
},
{
'name': 'staticcheck',
'image': 'webhippie/golang:1.14',
'image': 'webhippie/golang:1.15',
'pull': 'always',
'commands': [
'make staticcheck',
Expand All @@ -75,7 +75,7 @@ def testing(ctx):
},
{
'name': 'lint',
'image': 'webhippie/golang:1.14',
'image': 'webhippie/golang:1.15',
'pull': 'always',
'commands': [
'make lint',
Expand All @@ -89,7 +89,7 @@ def testing(ctx):
},
{
'name': 'build',
'image': 'webhippie/golang:1.14',
'image': 'webhippie/golang:1.15',
'pull': 'always',
'commands': [
'make build',
Expand All @@ -103,7 +103,7 @@ def testing(ctx):
},
{
'name': 'test',
'image': 'webhippie/golang:1.14',
'image': 'webhippie/golang:1.15',
'pull': 'always',
'commands': [
'make test',
Expand Down Expand Up @@ -150,19 +150,29 @@ def docker(ctx, arch):

if arch == 'amd64':
agent = 'amd64'
environment = {}
environment = {
'GOARCH': 'amd64',
}

if arch == 'arm32v6':
agent = 'arm'
environment = {}
agent = 'amd64'
environment = {
'GOARCH': 'arm',
'GOARM': '6',
}

if arch == 'arm32v7':
agent = 'arm'
environment = {}
agent = 'amd64'
environment = {
'GOARCH': 'arm',
'GOARM': '7',
}

if arch == 'arm64v8':
agent = 'arm64'
environment = {}
agent = 'amd64'
environment = {
'GOARCH': 'arm64',
}

if ctx.build.event == 'pull_request':
docker = {
Expand Down Expand Up @@ -196,7 +206,7 @@ def docker(ctx, arch):
'steps': [
{
'name': 'version',
'image': 'webhippie/golang:1.14',
'image': 'webhippie/golang:1.15',
'pull': 'always',
'environment': environment,
'commands': [
Expand All @@ -211,7 +221,7 @@ def docker(ctx, arch):
},
{
'name': 'generate',
'image': 'webhippie/golang:1.14',
'image': 'webhippie/golang:1.15',
'pull': 'always',
'environment': environment,
'commands': [
Expand All @@ -226,7 +236,7 @@ def docker(ctx, arch):
},
{
'name': 'build',
'image': 'webhippie/golang:1.14',
'image': 'webhippie/golang:1.15',
'pull': 'always',
'environment': environment,
'commands': [
Expand Down Expand Up @@ -276,7 +286,7 @@ def binary(ctx, name):
'steps': [
{
'name': 'generate',
'image': 'webhippie/golang:1.14',
'image': 'webhippie/golang:1.15',
'pull': 'always',
'commands': [
'make generate',
Expand All @@ -290,7 +300,7 @@ def binary(ctx, name):
},
{
'name': 'build',
'image': 'webhippie/golang:1.14',
'image': 'webhippie/golang:1.15',
'pull': 'always',
'commands': [
'make release-%s' % (name),
Expand All @@ -304,7 +314,7 @@ def binary(ctx, name):
},
{
'name': 'finish',
'image': 'webhippie/golang:1.14',
'image': 'webhippie/golang:1.15',
'pull': 'always',
'commands': [
'make release-finish',
Expand Down Expand Up @@ -526,15 +536,15 @@ def changelog(ctx):
},
{
'name': 'generate',
'image': 'webhippie/golang:1.14',
'image': 'webhippie/golang:1.15',
'pull': 'always',
'commands': [
'make changelog',
],
},
{
'name': 'changes',
'image': 'webhippie/golang:1.14',
'image': 'webhippie/golang:1.15',
'pull': 'always',
'commands': [
'git diff CHANGELOG.md',
Expand Down
28 changes: 15 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
module github.com/promhippie/prometheus-scw-sd

go 1.14
go 1.15

require (
github.com/cespare/reflex v0.2.0 // indirect
github.com/go-chi/chi v4.1.1+incompatible
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/go-chi/chi v1.5.4
github.com/go-kit/kit v0.10.0
github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/joho/godotenv v1.3.0
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/ogier/pflag v0.0.1 // indirect
github.com/oklog/run v1.1.0
github.com/prometheus/client_golang v1.5.1
github.com/prometheus/common v0.9.1
github.com/prometheus/prometheus v1.8.2-0.20200326161412-ae041f97cfc6
github.com/restic/calens v0.2.0 // indirect
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6
github.com/urfave/cli/v2 v2.2.0
gopkg.in/yaml.v2 v2.2.8
github.com/prometheus/client_golang v1.9.0
github.com/prometheus/common v0.19.0
github.com/prometheus/procfs v0.6.0 // indirect
github.com/prometheus/prometheus v1.8.2-0.20210217141258-a6be548dbc17
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7
github.com/urfave/cli/v2 v2.3.0
golang.org/x/mod v0.4.1 // indirect
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
golang.org/x/sys v0.0.0-20210313202042-bd2e13477e9c // indirect
gopkg.in/yaml.v2 v2.4.0
)
Loading

0 comments on commit 6e2b4bc

Please sign in to comment.