From c935d6c22613588aa9c4bcb983c9f1f499954611 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Mon, 21 Jan 2019 01:04:03 +0100 Subject: [PATCH] Fix duplicated step names --- .drone.jsonnet | 4 ++-- .drone.windows.yml | 20 ++++++++++---------- .drone.yml | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 18fc186..2bab7bd 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -43,7 +43,7 @@ local PipelineBuild(os="linux", arch="amd64") = { }, steps: [ { - name: "build", + name: "build-push", image: "golang:1.11", pull: "always", environment: { @@ -58,7 +58,7 @@ local PipelineBuild(os="linux", arch="amd64") = { }, }, { - name: "build", + name: "build-tag", image: "golang:1.11", pull: "always", environment: { diff --git a/.drone.windows.yml b/.drone.windows.yml index 462eb3c..1e13847 100644 --- a/.drone.windows.yml +++ b/.drone.windows.yml @@ -1,9 +1,9 @@ --- kind: pipeline -name: linux-amd64 +name: windows-amd64 platform: - os: linux + os: windows arch: amd64 steps: @@ -11,7 +11,7 @@ steps: pull: always image: golang:1.11 commands: - - "go build -v -ldflags \"-X main.build=${DRONE_BUILD_NUMBER}\" -a -o release/linux/amd64/drone-s3-sync" + - "go build -v -ldflags \"-X main.build=${DRONE_BUILD_NUMBER}\" -a -o release/windows/amd64/drone-s3-sync" environment: CGO_ENABLED: 0 GO111MODULE: on @@ -24,7 +24,7 @@ steps: pull: always image: golang:1.11 commands: - - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}\" -a -o release/linux/amd64/drone-s3-sync" + - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}\" -a -o release/windows/amd64/drone-s3-sync" environment: CGO_ENABLED: 0 GO111MODULE: on @@ -34,14 +34,14 @@ steps: - name: dryrun pull: always - image: plugins/docker:linux-amd64 + image: plugins/docker:windows-amd64 settings: - dockerfile: docker/Dockerfile.linux.amd64 + dockerfile: docker/Dockerfile.windows.amd64 dry_run: true password: from_secret: docker_password repo: plugins/s3-sync - tags: linux-amd64 + tags: windows-amd64 username: from_secret: docker_username when: @@ -50,11 +50,11 @@ steps: - name: publish pull: always - image: plugins/docker:linux-amd64 + image: plugins/docker:windows-amd64 settings: auto_tag: true - auto_tag_suffix: linux-amd64 - dockerfile: docker/Dockerfile.linux.amd64 + auto_tag_suffix: windows-amd64 + dockerfile: docker/Dockerfile.windows.amd64 password: from_secret: docker_password repo: plugins/s3-sync diff --git a/.drone.yml b/.drone.yml index a249580..85aa32e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,7 +36,7 @@ platform: arch: amd64 steps: -- name: build +- name: build-push pull: always image: golang:1.11 commands: @@ -49,7 +49,7 @@ steps: - push - pull_request -- name: build +- name: build-tag pull: always image: golang:1.11 commands: @@ -110,7 +110,7 @@ platform: arch: arm64 steps: -- name: build +- name: build-push pull: always image: golang:1.11 commands: @@ -123,7 +123,7 @@ steps: - push - pull_request -- name: build +- name: build-tag pull: always image: golang:1.11 commands: @@ -184,7 +184,7 @@ platform: arch: arm steps: -- name: build +- name: build-push pull: always image: golang:1.11 commands: @@ -197,7 +197,7 @@ steps: - push - pull_request -- name: build +- name: build-tag pull: always image: golang:1.11 commands: