From 900f815cd4d2d413a284b45ffaf721ec3f78c369 Mon Sep 17 00:00:00 2001
From: David Calavera <david.calavera@gmail.com>
Date: Mon, 29 Feb 2016 15:00:34 -0500
Subject: [PATCH] Make sure we build release artifacts and they are uploaded
 properly.

Signed-off-by: David Calavera <david.calavera@gmail.com>
---
 .travis.yml         |  4 +---
 appveyor.yml        | 13 +++++--------
 ci/before_deploy.sh |  6 ++++++
 3 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 ci/before_deploy.sh

diff --git a/.travis.yml b/.travis.yml
index 3b3afdc..4373e39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,7 @@
   script: make test
 
   before_deploy:
-    - mkdir bin
-    - go build -o bin/docker-credential-osxkeychain osxkeychain/cmd/main_darwin.go
-    - cd bin && tar czf ../docker-credential-osxkeychain-${TRAVIS_TAG}-amd64.tar.gz docker-credential-osxkeychain
+    - sh ci/before_deploy.sh
 
   deploy:
     provider: releases
diff --git a/appveyor.yml b/appveyor.yml
index 094bf94..93b9123 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,13 +32,12 @@ install:
   - go version
   - go env
 
-build_script:
+build: false
+
+test_script:
   - go vet ./wincred
   - go test -v github.com/docker/docker-credential-helpers/wincred
 
-# Disable automatic tests
-test: off
-
 # Equivalent to `before_deploy` phase
 after_test:
     # build binary
@@ -49,12 +48,10 @@ after_test:
 
 # IMPORTANT All the artifacts need to be listed here, or they won't be uploaded to GitHub
 artifacts:
-  - path: docker-credential-wincred-%APPVEYOR_REPO_TAG_NAME%-%GOARCH%.zip
-    name: docker-credential-wincred-%APPVEYOR_REPO_TAG_NAME%-%GOARCH%.zip
-    type: zip
+  - path: docker-credential-wincred-$(APPVEYOR_REPO_TAG_NAME)-$(GOARCH).zip
+    name: docker-credential-wincred-$(APPVEYOR_REPO_TAG_NAME)-$(GOARCH).zip
 
 deploy:
-  description: "Credential helpers release %APPVEYOR_REPO_TAG_NAME%"
   # All the zipped artifacts will be deployed
   artifact: /.*\.zip/
   auth_token:
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh
new file mode 100644
index 0000000..b735960
--- /dev/null
+++ b/ci/before_deploy.sh
@@ -0,0 +1,6 @@
+set -ex
+
+mkdir bin
+go build -o bin/docker-credential-osxkeychain osxkeychain/cmd/main_darwin.go
+cd bin 
+tar czf ../docker-credential-osxkeychain-${TRAVIS_TAG}-amd64.tar.gz docker-credential-osxkeychain