Skip to content

Commit

Permalink
dependabot-1 Update golang version to 1.18, dependencies, fix azure b…
Browse files Browse the repository at this point in the history
…ackend
  • Loading branch information
bdebyl committed Jul 14, 2022
1 parent d61e799 commit 341e490
Show file tree
Hide file tree
Showing 9 changed files with 921 additions and 124 deletions.
6 changes: 3 additions & 3 deletions .drone-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,23 @@ steps:
- mc admin policy set minio userpolicy user=foo

- name: build
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
commands:
- apk add --update make git
- make drone-cache
environment:
CGO_ENABLED: 0

- name: lint
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
commands:
- apk add --update make git curl
- make lint
environment:
CGO_ENABLED: 0

- name: test
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
commands:
- go test -mod=vendor -short -cover -tags=integration ./...
environment:
Expand Down
10 changes: 5 additions & 5 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,23 @@ steps:
- mc admin policy set minio userpolicy user=foo

- name: build
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
commands:
- apk add --update make git
- make drone-cache
environment:
CGO_ENABLED: 0

- name: lint
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
commands:
- apk add --update make git curl
- make lint
environment:
CGO_ENABLED: 0

- name: test
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
commands:
- go test -mod=vendor -short -cover -tags=integration ./...
environment:
Expand All @@ -59,7 +59,7 @@ steps:
path: /drone/src/tmp/testdata/cache

- name: generate
image: golang:1.14.1-alpine3.11
image: golang:1.18.4
commands:
- apk add --update make git
# Following environment tricks are because of unintended variable capture by flag library.
Expand Down Expand Up @@ -117,7 +117,7 @@ steps:
environment:
AWS_ACCESS_KEY_ID: AKIAIOSFODNN7EXAMPLE
AWS_SECRET_ACCESS_KEY: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY

- name: rebuild-cache-with-zstd
image: meltwater/drone-cache:v1.2.2
pull: always
Expand Down
10 changes: 5 additions & 5 deletions DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ steps:
- 'vendor'

- name: build
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
pull: true
commands:
- apk add --update make git
Expand Down Expand Up @@ -160,7 +160,7 @@ steps:
path: /tmp/cache

- name: build
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
pull: true
commands:
- apk add --update make git
Expand Down Expand Up @@ -212,7 +212,7 @@ steps:
- 'vendor'

- name: build
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
pull: true
commands:
- apk add --update make git
Expand Down Expand Up @@ -261,7 +261,7 @@ steps:
- 'vendor'

- name: build
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
pull: true
commands:
- apk add --update make git
Expand Down Expand Up @@ -300,7 +300,7 @@ steps:
debug: true

- name: build
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
pull: true
commands:
- apk add --update make git
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is designed to only used by goreleaser.
FROM golang:1.14.4-alpine3.12 AS builder
FROM golang:1.18.4 AS builder
RUN apk add --update --no-cache ca-certificates tzdata && update-ca-certificates

FROM scratch as runner
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ steps:
- 'vendor'

- name: build
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
pull: true
commands:
- apk add --update make git
Expand Down
10 changes: 5 additions & 5 deletions docs/examples/drone.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ steps:
- 'vendor'

- name: build
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
pull: true
commands:
- apk add --update make git
Expand Down Expand Up @@ -74,7 +74,7 @@ steps:
path: /tmp/cache

- name: build
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
pull: true
commands:
- apk add --update make git
Expand Down Expand Up @@ -127,7 +127,7 @@ steps:
- 'vendor'

- name: build
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
pull: true
commands:
- apk add --update make git
Expand Down Expand Up @@ -175,7 +175,7 @@ steps:
- 'vendor'

- name: build
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
pull: true
commands:
- apk add --update make git
Expand Down Expand Up @@ -214,7 +214,7 @@ steps:
debug: true

- name: build
image: golang:1.14.4-alpine3.12
image: golang:1.18.4
pull: true
commands:
- apk add --update make git
Expand Down
38 changes: 18 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
module github.com/meltwater/drone-cache

require (
cloud.google.com/go/storage v1.1.0
github.com/Azure/azure-storage-blob-go v0.8.0
github.com/Azure/go-autorest/autorest/adal v0.8.1 // indirect
github.com/aws/aws-sdk-go v1.36.29
github.com/davecgh/go-spew v1.1.1 // indirect
cloud.google.com/go v0.103.0 // indirect
cloud.google.com/go/storage v1.23.0
github.com/Azure/azure-storage-blob-go v0.15.0
github.com/aws/aws-sdk-go v1.44.55
github.com/dustin/go-humanize v1.0.0
github.com/go-kit/kit v0.9.0
github.com/go-logfmt/logfmt v0.4.0 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/google/go-cmp v0.4.0
github.com/klauspost/compress v1.13.5
github.com/pkg/sftp v1.10.1
github.com/urfave/cli/v2 v2.1.1
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/mod v0.2.0 // indirect
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
golang.org/x/tools v0.0.0-20200204192400-7124308813f3 // indirect
google.golang.org/api v0.9.0
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
honnef.co/go/tools v0.0.1-2020.1.3 // indirect
github.com/go-kit/kit v0.12.0
github.com/go-kit/log v0.2.1 // indirect
github.com/google/go-cmp v0.5.8
github.com/klauspost/compress v1.15.8
github.com/mattn/go-ieproxy v0.0.7 // indirect
github.com/pkg/sftp v1.13.5
github.com/urfave/cli/v2 v2.11.0
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
golang.org/x/oauth2 v0.0.0-20220630143837-2104d58473e0
golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
google.golang.org/api v0.87.0
google.golang.org/genproto v0.0.0-20220714152414-ccd2914cffd4 // indirect
google.golang.org/grpc v1.48.0 // indirect
)

go 1.14
Loading

0 comments on commit 341e490

Please sign in to comment.