Skip to content
This repository was archived by the owner on Feb 11, 2025. It is now read-only.

Merge release v1.1 #125

Merged
merged 6 commits into from
Jun 11, 2020
Merged

Merge release v1.1 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb23d78
Upgrade go 1.14.2
kakkoyun Apr 10, 2020
708519e
Update README
kakkoyun Apr 10, 2020
bc64af3
Make archive names uname compatible
kakkoyun Apr 10, 2020
7be4d2f
Build docker image for multiple arch/os
kakkoyun Apr 10, 2020
2a3ae3b
Upgrade go 1.14.4
kakkoyun Jun 11, 2020
32d6690
Merge branch 'master' into release-v1.1
kakkoyun Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ steps:
- mc mb --region=eu-west-1 minio/drone-cache-bucket

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

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

- name: test
image: golang:1.14.1-alpine3.11
image: golang:1.14.4-alpine3.12
commands:
- go test -mod=vendor -short -cover -tags=integration ./...
environment:
Expand Down
31 changes: 16 additions & 15 deletions .goreleaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ builds:
goarm:
- 6
- 7
ignore:
- goos: darwin
goarch: 386
env:
- CGO_ENABLED=0
flags:
Expand All @@ -33,9 +36,6 @@ builds:
-X main.Version={{.Version}}
-X main.Commit={{.ShortCommit}}
-X main.Date={{.Date}}
ignore:
- goos: darwin
goarch: 386
hooks:
# Ignores failures, this is just best effort. Alternative: find target/dist -name drone-cache -type f -exec upx {} +
post: find target/dist -name drone-cache -type f -print0 | xargs -n 1 -0 upx
Expand All @@ -48,17 +48,18 @@ archives:
format: zip
wrap_in_directory: true
replacements:
amd64: 64bit
386: 32bit
arm: ARM
arm64: ARM64
darwin: macOS
linux: linux
windows: windows
openbsd: openBSD
netbsd: netBSD
freebsd: freeBSD
dragonfly: dragonFlyBSD
# https://en.wikipedia.org/wiki/Uname
# uname -m compatible.
amd64: x86_64
386: i386
# uname -s compatible.
darwin: Darwin
linux: Linux
windows: Windows
openbsd: OpenBSD
netbsd: NetBSD
freebsd: FreeBSD
dragonfly: DragonFly
files:
- README.md
- CHANGELOG.md
Expand Down Expand Up @@ -99,7 +100,7 @@ dockers:
# .Arch GOARCH (usually allow replacements)
# .Arm GOARM (usually allow replacements)
# .Mips GOMIPS (usually allow replacements)
# TODO: Add more mirror registries
# TODO: Add github docker repo
# - "docker.pkg.github.com/meltwater/drone-cache/drone-cache:latest"
# - "docker.pkg.github.com/meltwater/drone-cache/drone-cache:{{ .Tag }}"
# - "docker.pkg.github.com/meltwater/drone-cache/drone-cache:v{{ .Major }}.{{ .Minor }}"
Expand Down
10 changes: 5 additions & 5 deletions DOCS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ steps:
- 'vendor'

- name: build
image: golang:1.14.1-alpine3.11
image: golang:1.14.4-alpine3.12
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.1-alpine3.11
image: golang:1.14.4-alpine3.12
pull: true
commands:
- apk add --update make git
Expand Down Expand Up @@ -212,7 +212,7 @@ steps:
- 'vendor'

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

- name: build
image: golang:1.14.1-alpine3.11
image: golang:1.14.4-alpine3.12
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.1-alpine3.11
image: golang:1.14.4-alpine3.12
pull: true
commands:
- apk add --update make git
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
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.1-alpine3.11 AS builder
FROM golang:1.14.4-alpine3.12 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ steps:
- 'vendor'

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

- name: build
image: golang:1.14.1-alpine3.11
image: golang:1.14.4-alpine3.12
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.1-alpine3.11
image: golang:1.14.4-alpine3.12
pull: true
commands:
- apk add --update make git
Expand Down Expand Up @@ -127,7 +127,7 @@ steps:
- 'vendor'

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

- name: build
image: golang:1.14.1-alpine3.11
image: golang:1.14.4-alpine3.12
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.1-alpine3.11
image: golang:1.14.4-alpine3.12
pull: true
commands:
- apk add --update make git
Expand Down