diff --git a/.drone.yml b/.drone.yml index 9b1cb9d6..e0aa56a1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,7 @@ 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 @@ -31,7 +31,7 @@ steps: 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 @@ -39,7 +39,7 @@ steps: 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: diff --git a/.goreleaser.yml b/.goreleaser.yml index 1cff946d..319b31c9 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -23,6 +23,9 @@ builds: goarm: - 6 - 7 + ignore: + - goos: darwin + goarch: 386 env: - CGO_ENABLED=0 flags: @@ -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 @@ -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 @@ -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 }}" diff --git a/DOCS.md b/DOCS.md index 0db11f1f..3a642d68 100644 --- a/DOCS.md +++ b/DOCS.md @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/Dockerfile b/Dockerfile index e574578b..ada1d335 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/README.md b/README.md index 6a168782..0cb61235 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/docs/examples/drone.md b/docs/examples/drone.md index 95dde7b0..1fcb9d6a 100644 --- a/docs/examples/drone.md +++ b/docs/examples/drone.md @@ -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 @@ -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 @@ -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 @@ -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 @@ -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