diff --git a/.drone.jsonnet b/.drone.jsonnet index 6d97aa4..909473d 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -39,10 +39,9 @@ ], }, - build('1.11'), - build('1.12'), - build('1.13'), - build('1.14-rc'), + build('1.16'), + build('1.17'), + build('1.18'), golang() { name: 'generate', diff --git a/.drone.yml b/.drone.yml index 22c5086..03c6cc9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,99 +1,75 @@ ---- kind: pipeline name: default - platform: - os: linux arch: amd64 - + os: linux steps: -- name: gomod - pull: always - image: golang:latest - commands: +- commands: - go mod vendor - git diff --exit-code environment: - CGO_ENABLED: 0 - GO111MODULE: on - when: - event: - exclude: - - tag - -- name: build-1.11 - pull: always - image: golang:1.11 - commands: - - make build - - make test - - make test-integration - environment: - CGO_ENABLED: 0 - GO111MODULE: on - when: - event: - exclude: - - tag - -- name: build-1.12 - pull: always - image: golang:1.12 - commands: - - make build - - make test - - make test-integration - environment: - CGO_ENABLED: 0 - GO111MODULE: on - when: - event: - exclude: - - tag - -- name: build-1.13 - pull: always - image: golang:1.13 - commands: - - make build - - make test - - make test-integration - environment: - CGO_ENABLED: 0 - GO111MODULE: on - when: - event: - exclude: - - tag - -- name: build-1.14-rc - pull: always - image: golang:1.14-rc - commands: - - make build - - make test - - make test-integration - environment: - CGO_ENABLED: 0 - GO111MODULE: on - when: - event: - exclude: - - tag - -- name: generate - pull: always + CGO_ENABLED: "0" + GO111MODULE: "on" image: golang:latest - commands: + name: gomod + pull: always + when: + event: + exclude: + - tag +- commands: + - make build + - make test + - make test-integration + environment: + CGO_ENABLED: "0" + GO111MODULE: "on" + image: golang:1.16 + name: build-1.16 + pull: always + when: + event: + exclude: + - tag +- commands: + - make build + - make test + - make test-integration + environment: + CGO_ENABLED: "0" + GO111MODULE: "on" + image: golang:1.17 + name: build-1.17 + pull: always + when: + event: + exclude: + - tag +- commands: + - make build + - make test + - make test-integration + environment: + CGO_ENABLED: "0" + GO111MODULE: "on" + image: golang:1.18 + name: build-1.18 + pull: always + when: + event: + exclude: + - tag +- commands: - make check-license - make generate - git diff --exit-code environment: - CGO_ENABLED: 0 - GO111MODULE: on + CGO_ENABLED: "0" + GO111MODULE: "on" + image: golang:latest + name: generate + pull: always when: event: exclude: - tag - -... diff --git a/Dockerfile b/Dockerfile index 5c66ab9..804f6f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM busybox:1.33.0 +FROM busybox:1.35.0 COPY _output/linux/amd64/jb / diff --git a/Makefile b/Makefile index 0aca0c5..f766908 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ check-license: @./scripts/check_license.sh embedmd: - pushd /tmp && GO111MODULES=on go get github.com/campoy/embedmd && popd + pushd /tmp && go install github.com/campoy/embedmd@latest && popd # Other clean: