Merge pull request #387 from vdice/move-prep-bintray-json

feat(Makefile): move prep-bintray-json and _scripts/ci into client directory

Author: vdice

.gitignore

@@ -44,4 +44,4 @@ venv/
 vendor/
 
 # generated bintray scripts during ci
-_scripts/ci/bintray-ci.json
+client/_scripts/ci/bintray-ci.json

.travis.yml

@@ -32,12 +32,10 @@ install:
   - pip install -r rootfs/dev_requirements.txt
   - make -C docs/ deps
   - GLIDE_HOME=/home/travis/.glide make -C client bootstrap
-  - make prep-bintray-json
 script:
   - make test
-  - make -C client/ bootstrap build test dist
+  - make -C client/ bootstrap build test dist prep-bintray-json
   - make -C docs/ build test
-  - make prep-bintray-json
 deploy:
   - provider: script
     # ensure client/doc builds aren't removed

Makefile

@@ -17,16 +17,6 @@ check-docker:
 	  exit 2; \
 	fi
 
-prep-bintray-json:
-# TRAVIS_TAG is set to the tag name if the build is a tag
-ifdef TRAVIS_TAG
-	@jq '.version.name |= "$(VERSION)"' _scripts/ci/bintray-template.json | \
-		jq '.package.repo |= "deis"' > _scripts/ci/bintray-ci.json
-else
-	@jq '.version.name |= "$(VERSION)"' _scripts/ci/bintray-template.json \
-		> _scripts/ci/bintray-ci.json
-endif
-
 build: docker-build
 
 docker-build: check-docker

client/Makefile

@@ -26,6 +26,16 @@ define check-static-binary
   fi
 endef
 
+prep-bintray-json:
+# TRAVIS_TAG is set to the tag name if the build is a tag
+ifdef TRAVIS_TAG
+	@jq '.version.name |= "$(VERSION)"' _scripts/ci/bintray-template.json | \
+		jq '.package.repo |= "deis"' > _scripts/ci/bintray-ci.json
+else
+	@jq '.version.name |= "$(VERSION)"' _scripts/ci/bintray-template.json \
+		> _scripts/ci/bintray-ci.json
+endif
+
 bootstrap:
 	${DEV_ENV_CMD} glide install