Fix windows pipeline

.drone.yml

@@ -63,8 +63,6 @@ steps:
       from_secret: docker_password
   commands:
   - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
 
 - name: build_tag
   environment:
@@ -86,7 +84,7 @@ trigger:
   ref:
   - refs/heads/master
   - refs/tags/*
-
+  - "refs/pull/**"
 ---
 kind: pipeline
 type: ssh

card.go

@@ -1,48 +0,0 @@
-package docker
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-)
-
-func (p Plugin) writeCard() error {
-	cmd := exec.Command("docker", "inspect", p.Build.Name)
-	data, err := cmd.CombinedOutput()
-	if err != nil {
-		return err
-	}
-
-	out := map[string]interface{}{} // replace with docker inspect struct
-	if err := json.Unmarshal(data, &out); err != nil {
-		return err
-	}
-
-	card := map[string]interface{}{} // replace with card struct, populate with docker inspect output
-
-	writeCard( /*p.CardPath*/ "", &card)
-	return nil
-}
-
-func writeCard(path string, card interface{}) {
-	data, _ := json.Marshal(card)
-	switch {
-	case path == "/dev/stdout":
-		writeCardTo(os.Stdout, data)
-	case path == "/dev/stderr":
-		writeCardTo(os.Stderr, data)
-	case path != "":
-		ioutil.WriteFile(path, data, 0644)
-	}
-}
-
-func writeCardTo(out io.Writer, data []byte) {
-	encoded := base64.StdEncoding.EncodeToString(data)
-	io.WriteString(out, "\u001B]1338;")
-	io.WriteString(out, encoded)
-	io.WriteString(out, "\u001B]0m")
-	io.WriteString(out, "\n")
-}

docker.go

@@ -156,6 +156,11 @@ func (p Plugin) Exec() error {
 		}
 	}
 
+	if p.Cleanup {
+		cmds = append(cmds, commandRmi(p.Build.Name)) // docker rmi
+		cmds = append(cmds, commandPrune())           // docker system prune -f
+	}
+
 	// execute all commands in batch mode.
 	for _, cmd := range cmds {
 		cmd.Stdout = os.Stdout
@@ -174,26 +179,6 @@ func (p Plugin) Exec() error {
 		}
 	}
 
-	// output the adaptive card
-	if err := p.writeCard(); err != nil {
-		fmt.Printf("Could not create adaptive card. %s\n", err)
-	}
-
-	// execute cleanup routines in batch mode
-	if p.Cleanup {
-		// clear the slice
-		cmds = nil
-
-		cmds = append(cmds, commandRmi(p.Build.Name)) // docker rmi
-		cmds = append(cmds, commandPrune())           // docker system prune -f
-
-		for _, cmd := range cmds {
-			cmd.Stdout = os.Stdout
-			cmd.Stderr = os.Stderr
-			trace(cmd)
-		}
-	}
-
 	return nil
 }
 

scripts/windows/latest.ps1

@@ -1,6 +1,5 @@
 # this script is used by the continuous integration server to
 # build and publish the docker image for a commit to master.
-$ErrorActionPreference = "Stop"
 
 $env:GOOS="windows"
 $env:GOARCH="amd64"
@@ -14,22 +13,23 @@ if (-not (Test-Path env:REGISTRY)) {
     $env:REGISTRY="docker"
 }
 
+
 echo $env:GOOS
 echo $env:GOARCH
 echo $env:VERSION
 echo $env:REGISTRY
 
 # build the binary
-Write-Host "+ go build -o release/windows/amd64/drone-${env:REGISTRY}.exe";
+Write-Host "+ go build -o release/windows/amd64/drone-$env:REGISTRY.exe";
-go build -o release/windows/amd64/drone-${env:REGISTRY}.exe ./cmd/drone-${env:REGISTRY}
+go build -o release/windows/amd64/drone-$env:REGISTRY.exe
 
 # build and publish the docker image
-docker login -u ${env:USERNAME} -p ${env:PASSWORD}
+docker login -u $env:USERNAME -p $env:PASSWORD
-Write-Host "+ docker build -f docker/${env:REGISTRY}/Dockerfile.windows.amd64.${env:VERSION} -t plugins/${env:REGISTRY}:windows-${env:VERSION}-amd64 .";
+Write-Host "+ docker build -f docker/$env:REGISTRY/Dockerfile.windows.amd64.$env:VERSION -t plugins/$env:REGISTRY:windows-$env:VERSION-amd64 .";
-docker build -f docker/${env:REGISTRY}/Dockerfile.windows.amd64.${env:VERSION} -t plugins/${env:REGISTRY}:windows-${env:VERSION}-amd64 .
+docker build -f docker/$env:REGISTRY/Dockerfile.windows.amd64.$env:VERSION -t plugins/$env:REGISTRY:windows-$env:VERSION-amd64 .
-Write-Host "+ docker push plugins/${env:REGISTRY}:windows-${env:VERSION}-amd64"
+Write-Host "+ docker push plugins/$env:REGISTRY:windows-$env:VERSION-amd64"
-docker push plugins/${env:REGISTRY}:windows-${env:VERSION}-amd64
+docker push plugins/$env:REGISTRY:windows-$env:VERSION-amd64
 
 # remove images from local cache
-Write-Host "+ docker rmi plugins/${env:REGISTRY}:windows-${env:VERSION}-amd64"
+Write-Host "+ docker rmi plugins/$env:REGISTRY:windows-$env:VERSION-amd64"
-docker rmi plugins/${env:REGISTRY}:windows-${env:VERSION}-amd64
+docker rmi plugins/$env:REGISTRY:windows-$env:VERSION-amd64

scripts/windows/tag.ps1

@@ -1,6 +1,5 @@
 # this script is used by the continuous integration server to
 # build and publish the docker image for a tagged revsision.
-$ErrorActionPreference = "Stop"
 
 $env:GOOS="windows"
 $env:GOARCH="amd64"
@@ -20,9 +19,9 @@ if (-not (Test-Path env:REGISTRY)) {
 }
 
 # define the image tags
-$env:IMAGE_PATCH="plugins/${env:REGISTRY}:${env:DRONE_SEMVER_SHORT}-windows-${env:VERSION}-amd64"
+$env:IMAGE_PATCH="plugins/$env:REGISTRY:$env:DRONE_SEMVER_SHORT-windows-$env:VERSION-amd64"
-$env:IMAGE_MAJOR="plugins/${env:REGISTRY}:${env:DRONE_SEMVER_MAJOR}-windows-${env:VERSION}-amd64"
+$env:IMAGE_MAJOR="plugins/$env:REGISTRY:$env:DRONE_SEMVER_MAJOR-windows-$env:VERSION-amd64"
-$env:IMAGE_MINOR="plugins/${env:REGISTRY}:${env:DRONE_SEMVER_MAJOR}.${env:DRONE_SEMVER_MINOR}-windows-${env:VERSION}-amd64"
+$env:IMAGE_MINOR="plugins/$env:REGISTRY:$env:DRONE_SEMVER_MAJOR.$env:DRONE_SEMVER_MINOR-windows-$env:VERSION-amd64"
 
 echo "build environment:"
 echo $env:GOOS
@@ -30,37 +29,27 @@ echo $env:GOARCH
 echo $env:VERSION
 
 # build the binary
-Write-Host "+ go build -o release/windows/amd64/drone-${env:REGISTRY}.exe"
+go build -o release/windows/amd64/drone-$env:REGISTRY.exe
-go build -o release/windows/amd64/drone-${env:REGISTRY}.exe ./cmd/drone-${env:REGISTRY}
 
 # authenticate with the docker registry
-docker login -u ${env:USERNAME} -p ${env:PASSWORD}
+docker login -u $env:USERNAME -p $env:PASSWORD
 
 echo "building images:"
-echo ${env:IMAGE_PATCH}
+echo $env:IMAGE_PATCH
-echo ${env:IMAGE_MINOR}
+echo $env:IMAGE_MINOR
-echo ${env:IMAGE_MAJOR}
+echo $env:IMAGE_MAJOR
 
 # build and tag the docker images
-Write-Host "+ docker build -f docker/${env:REGISTRY}/Dockerfile.windows.amd64.${env:VERSION} -t ${env:IMAGE_PATCH} ."
+docker build -f docker/$env:REGISTRY/Dockerfile.windows.amd64.$env:VERSION -t $env:IMAGE_PATCH .
-docker build -f docker/${env:REGISTRY}/Dockerfile.windows.amd64.${env:VERSION} -t ${env:IMAGE_PATCH} .
+docker tag $env:IMAGE_PATCH $env:IMAGE_MAJOR
-Write-Host "+ docker tag ${env:IMAGE_PATCH} ${env:IMAGE_MAJOR}"
+docker tag $env:IMAGE_PATCH $env:IMAGE_MINOR
-docker tag ${env:IMAGE_PATCH} ${env:IMAGE_MAJOR}
-Write-Host "+ docker tag ${env:IMAGE_PATCH} ${env:IMAGE_MINOR}"
-docker tag ${env:IMAGE_PATCH} ${env:IMAGE_MINOR}
 
 # publish the docker images
-Write-Host "+ docker push ${env:IMAGE_MAJOR}"
+docker push $env:IMAGE_MAJOR
-docker push ${env:IMAGE_MAJOR}
+docker push $env:IMAGE_MINOR
-Write-Host "+ docker push ${env:IMAGE_MINOR}"
+docker push $env:IMAGE_PATCH
-docker push ${env:IMAGE_MINOR}
-Write-Host "+ docker push ${env:IMAGE_PATCH}"
-docker push ${env:IMAGE_PATCH}
 
 # remove images after from local cache
-Write-Host "+ docker rmi ${env:IMAGE_MAJOR}"
+docker rmi $env:IMAGE_MAJOR
-docker rmi ${env:IMAGE_MAJOR}
+docker rmi $env:IMAGE_MINOR
-Write-Host "+ docker rmi ${env:IMAGE_MINOR}"
+docker rmi $env:IMAGE_PATCH
-docker rmi ${env:IMAGE_MINOR}
-Write-Host "+ docker rmi ${env:IMAGE_PATCH}"
-docker rmi ${env:IMAGE_PATCH}