From da17fb3d2f704ca466dd1d99ddb6a3f6bc7b7c94 Mon Sep 17 00:00:00 2001 From: Alex Suraci Date: Sat, 30 Jan 2016 11:55:55 -0800 Subject: [PATCH] use explicit output --- Dockerfile | 6 +++--- build.yml | 7 +++++-- scripts/build | 9 ++++++--- scripts/ci | 4 ++++ 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2bd2852..80016de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,6 @@ RUN for cert in `ls -1 /etc/ssl/certs/*.crt | grep -v /etc/ssl/certs/ca-certific do cat "$cert" >> /etc/ssl/certs/ca-certificates.crt; \ done -ADD built-check /opt/resource/check -ADD built-in /opt/resource/in -ADD built-out /opt/resource/out +ADD assets/check /opt/resource/check +ADD assets/in /opt/resource/in +ADD assets/out /opt/resource/out diff --git a/build.yml b/build.yml index 17ab485..4109797 100644 --- a/build.yml +++ b/build.yml @@ -3,8 +3,11 @@ platform: linux image: docker:///concourse/static-golang inputs: - - name: github-release-resource - path: gopath/src/github.com/concourse/github-release-resource +- name: github-release-resource + path: gopath/src/github.com/concourse/github-release-resource + +outputs: +- name: built-resource run: path: gopath/src/github.com/concourse/github-release-resource/scripts/ci diff --git a/scripts/build b/scripts/build index 7da2bdd..1b40f8c 100755 --- a/scripts/build +++ b/scripts/build @@ -1,5 +1,8 @@ #!/bin/bash -go build -o built-check ./cmd/check -go build -o built-in ./cmd/in -go build -o built-out ./cmd/out +set -e -u -x + +mkdir -p assets +go build -o assets/check ./cmd/check +go build -o assets/in ./cmd/in +go build -o assets/out ./cmd/out diff --git a/scripts/ci b/scripts/ci index c51c63f..bf5f116 100755 --- a/scripts/ci +++ b/scripts/ci @@ -6,6 +6,8 @@ set -eu export GOPATH=$PWD/gopath export PATH=$GOPATH/bin:$PATH +BUILD_DIR=$PWD/built-resource + cd $GOPATH/src/github.com/concourse/github-release-resource export GOPATH=${PWD}/Godeps/_workspace:$GOPATH @@ -16,3 +18,5 @@ go install github.com/onsi/ginkgo/ginkgo CGO_ENABLED=1 ginkgo -race -r -p "$@" ./scripts/build + +cp -a assets Dockerfile $BUILD_DIR