Skip to content
This repository has been archived by the owner on Aug 23, 2019. It is now read-only.

Commit

Permalink
Merge pull request #87 from goinstant/release-v3.3.4
Browse files Browse the repository at this point in the history
Release v3.3.4
  • Loading branch information
colinmacdonald committed Apr 2, 2014
2 parents f298fd4 + 9edb9d3 commit b7c602e
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 4 deletions.
33 changes: 31 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,36 @@ node_js:
- '0.10'
before_script:
- npm install -g gulp
- source deploy/tags.sh
before_deploy:
- gulp build
deploy:
- provider: s3
access_key_id: $AWS_S3_ID
secret_access_key: $AWS_S3_SECRET
bucket: cdn.goinstant.net
local-dir: dist
upload-dir: integrations/goangular/latest
on:
all_branches: true
repo: goinstant/goangular
condition:
- $IS_TAG != 0
- $IS_LATEST != 0
- provider: s3
access_key_id: $AWS_S3_ID
secret_access_key: $AWS_S3_SECRET
bucket: cdn.goinstant.net
local-dir: dist
upload-dir: integrations/goangular/$TRAVIS_BRANCH
on:
all_branches: true
repo: goinstant/goangular
condition:
- $IS_TAG != 0
after_deploy:
- echo "deployed $TRAVIS_BRANCH"
env:
global:
- secure: FtRPdbkLCmXgQdOn03hunzpa4GLJMvLweLLi9qC3Su8oSCnBVcGyScde0z67tNeEuQjA1mQ52DsKaEZG8n++i8l9ZcTVSgrjmRQ6u+YH23hH74mqOPZOiJJyW7nMmJy8PSa9C3/5ZoMlTwiyXy6plDCFQn+qTpj9ohlzvY7RWX0=
- secure: Pf/V38ggv1wg81IJYAgczTBGIteajbhugrlUCDlGVy5VomNeHMNG1+cuAL3o0VysO/3j71dfL+06DAegnwGgnZokSsyhV8wrpyJZ6/UGhCviLzLTzg053vGBu6vZzu+GIUS0z+RS3hwu4G+Q5cC/RtrQfx2AbX9rfj/T64pvItc=
- secure: C3ns4bIP1h9PzP127HeXTdIFWLshNj6CQENyT1BUWxmRFYfRHWQHTLXhYtw9Clv42L+kehoEA6Lak4hyNQXa0J26d4skum0YHVycIoS90bE96TN5I3NYSTWJI61lou0cl+D1kByrTIqr1jZxomGNGF+xWmxcwaXIwTntegPPwnQ=
- secure: mswog/W9YCauQbjUA9FCjwP/WkH3mV5QPPcQHOG4CgaT70UXeYeKJPol+oNimBe4jzmsrmd8emsZHvD2sW2pIbrX9v1ZIUZwUH++R1z+EiqvP31sed/CcpEiUH5s1dMnQ/lTFmvTP0ILBFFe7X1NYmicT11rhrvGRGV55Ps37Rw=
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "goangular",
"main": "dist/goangular.js",
"version": "3.3.0",
"version": "3.3.4",
"homepage": "https://github.com/goinstant/goangular",
"authors": [
"GoInstant",
Expand Down
15 changes: 15 additions & 0 deletions deploy/tags.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
git fetch --tags

LATEST_TAG_HASH=`git rev-list --tags --max-count=1`

# 0 - false
# !0 - true
IS_TAG=`git tag --points-at $TRAVIS_COMMIT | grep -w $TRAVIS_BRANCH | wc -l`
IS_LATEST=`git describe --tags --exact-match $LATEST_TAG_HASH | grep -w $TRAVIS_BRANCH | wc -l`

echo "Latest tag hash: $LATEST_TAG_HASH"
echo "Is tag: $IS_TAG"
echo "Is latest: $IS_LATEST"

export IS_TAG
export IS_LATEST
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "goangular",
"version": "3.3.0",
"version": "3.3.4",
"description": "AngularJS bindings for GoInstant",
"main": "Gruntfile.js",
"scripts": {
Expand Down

0 comments on commit b7c602e

Please sign in to comment.