From 5e47c6178865cb4d90c62ab2166e2096e67ca763 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Sun, 29 Sep 2019 10:12:57 +0800 Subject: [PATCH] chore: upgrade to go1.13 --- .drone.yml | 74 ++++++++++++++++++---------------------------- pipeline.libsonnet | 33 +++++---------------- 2 files changed, 37 insertions(+), 70 deletions(-) diff --git a/.drone.yml b/.drone.yml index f3b2274..d946906 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,47 +9,39 @@ platform: steps: - name: vet pull: always - image: golang:1.12 + image: golang:1.13 commands: - make vet - environment: - GO111MODULE: on volumes: - name: gopath path: /go - name: lint pull: always - image: golang:1.12 + image: golang:1.13 commands: - make lint - environment: - GO111MODULE: on volumes: - name: gopath path: /go - name: misspell pull: always - image: golang:1.12 + image: golang:1.13 commands: - make misspell-check - environment: - GO111MODULE: on volumes: - name: gopath path: /go - name: test pull: always - image: golang:1.12-alpine + image: golang:1.13-alpine commands: - apk add git make curl perl bash build-base zlib-dev ucl-dev - make ssh-server - make test - make coverage - environment: - GO111MODULE: on volumes: - name: gopath path: /go @@ -76,12 +68,11 @@ platform: steps: - name: build-push pull: always - image: golang:1.12 + image: golang:1.13 commands: - - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-ssh" + - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-ssh environment: CGO_ENABLED: 0 - GO111MODULE: on when: event: exclude: @@ -89,19 +80,18 @@ steps: - name: build-tag pull: always - image: golang:1.12 + image: golang:1.13 commands: - - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-ssh" + - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-ssh environment: CGO_ENABLED: 0 - GO111MODULE: on when: event: - tag - name: executable pull: always - image: golang:1.12 + image: golang:1.13 commands: - ./release/linux/amd64/drone-ssh --help @@ -140,8 +130,8 @@ steps: trigger: ref: - refs/heads/master - - "refs/pull/**" - - "refs/tags/**" + - refs/pull/** + - refs/tags/** depends_on: - testing @@ -157,12 +147,11 @@ platform: steps: - name: build-push pull: always - image: golang:1.12 + image: golang:1.13 commands: - - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-ssh" + - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-ssh environment: CGO_ENABLED: 0 - GO111MODULE: on when: event: exclude: @@ -170,19 +159,18 @@ steps: - name: build-tag pull: always - image: golang:1.12 + image: golang:1.13 commands: - - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-ssh" + - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-ssh environment: CGO_ENABLED: 0 - GO111MODULE: on when: event: - tag - name: executable pull: always - image: golang:1.12 + image: golang:1.13 commands: - ./release/linux/arm64/drone-ssh --help @@ -221,8 +209,8 @@ steps: trigger: ref: - refs/heads/master - - "refs/pull/**" - - "refs/tags/**" + - refs/pull/** + - refs/tags/** depends_on: - testing @@ -238,12 +226,11 @@ platform: steps: - name: build-push pull: always - image: golang:1.12 + image: golang:1.13 commands: - - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-ssh" + - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-ssh environment: CGO_ENABLED: 0 - GO111MODULE: on when: event: exclude: @@ -251,19 +238,18 @@ steps: - name: build-tag pull: always - image: golang:1.12 + image: golang:1.13 commands: - - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-ssh" + - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-ssh environment: CGO_ENABLED: 0 - GO111MODULE: on when: event: - tag - name: executable pull: always - image: golang:1.12 + image: golang:1.13 commands: - ./release/linux/arm/drone-ssh --help @@ -302,8 +288,8 @@ steps: trigger: ref: - refs/heads/master - - "refs/pull/**" - - "refs/tags/**" + - refs/pull/** + - refs/tags/** depends_on: - testing @@ -319,11 +305,9 @@ platform: steps: - name: build-all-binary pull: always - image: golang:1.12 + image: golang:1.13 commands: - make release - environment: - GO111MODULE: on when: event: - tag @@ -335,14 +319,14 @@ steps: api_key: from_secret: github_release_api_key files: - - "dist/release/*" + - dist/release/* when: event: - tag trigger: ref: - - "refs/tags/**" + - refs/tags/** depends_on: - testing @@ -377,7 +361,7 @@ steps: trigger: ref: - refs/heads/master - - "refs/tags/**" + - refs/tags/** depends_on: - linux-amd64 diff --git a/pipeline.libsonnet b/pipeline.libsonnet index 4fb6047..e3a983b 100644 --- a/pipeline.libsonnet +++ b/pipeline.libsonnet @@ -9,11 +9,8 @@ steps: [ { name: 'vet', - image: 'golang:1.12', + image: 'golang:1.13', pull: 'always', - environment: { - GO111MODULE: 'on', - }, commands: [ 'make vet', ], @@ -26,11 +23,8 @@ }, { name: 'lint', - image: 'golang:1.12', + image: 'golang:1.13', pull: 'always', - environment: { - GO111MODULE: 'on', - }, commands: [ 'make lint', ], @@ -43,11 +37,8 @@ }, { name: 'misspell', - image: 'golang:1.12', + image: 'golang:1.13', pull: 'always', - environment: { - GO111MODULE: 'on', - }, commands: [ 'make misspell-check', ], @@ -60,11 +51,8 @@ }, { name: 'test', - image: 'golang:1.12-alpine', + image: 'golang:1.13-alpine', pull: 'always', - environment: { - GO111MODULE: 'on', - }, commands: [ 'apk add git make curl perl bash build-base zlib-dev ucl-dev', 'make ssh-server', @@ -105,11 +93,10 @@ steps: [ { name: 'build-push', - image: 'golang:1.12', + image: 'golang:1.13', pull: 'always', environment: { CGO_ENABLED: '0', - GO111MODULE: 'on', }, commands: [ 'go build -v -ldflags \'-X main.build=${DRONE_BUILD_NUMBER}\' -a -o release/' + os + '/' + arch + '/' + name, @@ -122,11 +109,10 @@ }, { name: 'build-tag', - image: 'golang:1.12', + image: 'golang:1.13', pull: 'always', environment: { CGO_ENABLED: '0', - GO111MODULE: 'on', }, commands: [ 'go build -v -ldflags \'-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}\' -a -o release/' + os + '/' + arch + '/' + name, @@ -137,7 +123,7 @@ }, { name: 'executable', - image: 'golang:1.12', + image: 'golang:1.13', pull: 'always', commands: [ './release/' + os + '/' + arch + '/' + name + ' --help', @@ -202,11 +188,8 @@ steps: [ { name: 'build-all-binary', - image: 'golang:1.12', + image: 'golang:1.13', pull: 'always', - environment: { - GO111MODULE: 'on', - }, commands: [ 'make release' ],