Skip to content

Commit 5502cf5

Browse files
author
Matthew Fisher
committed
Merge pull request #98 from bacongobbler/94-bintray-deployments
feat(travis): deploy client builds to bintray
2 parents f21b21f + 35abd9d commit 5502cf5

4 files changed

Lines changed: 46 additions & 8 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,6 @@ venv/
4040

4141
# vendored go source code
4242
vendor/
43+
44+
# generated bintray scripts during ci
45+
_scripts/ci/bintray-ci.json

.travis.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,29 @@ install:
3232
- pip install -r rootfs/dev_requirements.txt
3333
- make -C docs/ deps
3434
- GLIDE_HOME=/home/travis/.glide make -C client bootstrap
35+
- make prep-bintray-json
3536
script:
3637
- make test
3738
- make -C client/ build test
3839
- make -C docs/ build test
3940
deploy:
40-
provider: script
41-
# ensure client/doc builds aren't removed
42-
# see https://docs.travis-ci.com/user/deployment/#Uploading-Files
43-
skip_cleanup: true
44-
script: _scripts/deploy.sh
45-
on:
46-
branch: master
41+
- provider: script
42+
# ensure client/doc builds aren't removed
43+
# see https://docs.travis-ci.com/user/deployment/#Uploading-Files
44+
skip_cleanup: true
45+
script: _scripts/deploy.sh
46+
on:
47+
branch: master
48+
- provider: bintray
49+
skip_cleanup: true
50+
file: _scripts/ci/bintray-ci.json
51+
user: deis-admin
52+
key:
53+
secure: "JVCyPvXZIabZBhWgZ2wX4UDoTpIAjVnp+Ox6cXywYbACzKZSTz6G1kFcItzpUiEygUtye1213Zb+2050jq3BK7wohy5lcZCDJgrhyw6RxTRWIQQ5o+pS+O/AOYCSbpPn2E5goNutAhlOVsf2TlXkt4wz0jl5qOaecm0QXoiXBPUH5H1a3ifnCylybVG2jc2Kj/9S5uMGDQqocrPTXedZo9E/Es61MbKttlJGfcIrjbS71J8QZvDTcTSjzGT5CVdQulzkLNmFI5y31XwBE9XC6ro/Can10bIvy6yzYSWraUBTXVLWY2mPrPSlohOqNiYg2goQFQ2KwAGe6mVbq3UqOrYqNLXDdpSnCsRkx2KBw+ifET+0neq1NI3v5oSjKZ+p2zKCWQoOxahU40Eg+hA12oN17yHglaj2PGLuxYicDc+BQEGcGdBHAPJNXALd+rSDCdq5Gnd9HsCQE2Tyc+YK2bKvfpgcQNLS7gtiIxoRLZ1/qRBq3SB3IyQik7jjPe9Y0Meqnmdk8PeXM113/MSGdqZtVfyaOcT8SPgN22dhV42fs/BQtplTT3Hcs3yhmDwtl1w1udynerHcWx0PqZFn3h95SozJFPi8UdsbZog5V/CY/OAFs3K4bm3ay4Re1r2vTFCRuukp6UwtT5QR4kjsKWrLkewFbjId2FazJA8kMc4="
54+
on:
55+
tags: true
56+
branch: master
4757
addons:
4858
artifacts:
4959
paths:
50-
- client/deis
5160
- docs/_build

Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@ check-docker:
1212
exit 2; \
1313
fi
1414

15+
prep-bintray-json:
16+
# TRAVIS_TAG is set to the tag name if the build is a tag
17+
ifdef TRAVIS_TAG
18+
@jq '.version.name |= "$(VERSION)"' _scripts/ci/bintray-template.json | \
19+
jq '.package.repo |= "deis"' > _scripts/ci/bintray-ci.json
20+
else
21+
@jq '.version.name |= "$(VERSION)"' _scripts/ci/bintray-template.json \
22+
> _scripts/ci/bintray-ci.json
23+
endif
24+
1525
build: docker-build
1626

1727
docker-build: check-docker

_scripts/ci/bintray-template.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"package": {
3+
"name": "deis",
4+
"repo": "deisci",
5+
"subject": "deis"
6+
},
7+
"version": {
8+
"name": "0.0.0"
9+
},
10+
"files": [
11+
{
12+
"includePattern": "client/deis"
13+
}
14+
],
15+
"publish": true
16+
}

0 commit comments

Comments
 (0)