Skip to content

Commit

Permalink
deploy on tag
Browse files Browse the repository at this point in the history
  • Loading branch information
wheresrhys committed Jul 15, 2016
1 parent 6aa4cfe commit c0c4446
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
6 changes: 6 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
machine:
node:
version: 4.4.7
deployment:
release:
tag: /^v[0-9]+(.[0-9]+)*/
owner: Financial-Times
commands:
- make npm-publish
8 changes: 6 additions & 2 deletions n.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ SHELL := /bin/bash
# Some handy utilities
GLOB = git ls-files -z $1 | tr '\0' '\n' | xargs -I {} find {} ! -type l
NPM_INSTALL = npm prune --production=false && npm install
BOWER_INSTALL = bower install --config.registry.search=http://registry.origami.ft.com --config.registry.search=https://bower.herokuapp.com
BOWER_INSTALL = bower prune && bower install --config.registry.search=http://registry.origami.ft.com --config.registry.search=https://bower.herokuapp.com
JSON_GET_VALUE = grep $1 | head -n 1 | sed 's/[," ]//g' | cut -d : -f 2
IS_GIT_IGNORED = grep -q $(if $1, $1, $@) .gitignore
VERSION = v1.3.2
VERSION = v1.4.3
APP_NAME = $(shell cat package.json 2>/dev/null | $(call JSON_GET_VALUE,name))
DONE = echo ✓ $@ done
CONFIG_VARS = curl -fsL https://ft-next-config-vars.herokuapp.com/$1/$(call APP_NAME)$(if $2,.$2,) -H "Authorization: `heroku config:get APIKEY --app ft-next-config-vars`"
Expand Down Expand Up @@ -123,6 +123,10 @@ _deploy_apex:
@if [ -e project.json ]; then $(call CONFIG_VARS,production) > $(APEX_PROD_ENV_FILE) && apex deploy --env-file $(APEX_PROD_ENV_FILE); fi
@if [ -e $(APEX_PROD_ENV_FILE) ]; then rm $(APEX_PROD_ENV_FILE) && $(DONE); fi

npm-publis%:
npm-prepublish --verbose
npm publish --access public

# BUILD SUB-TASKS

# Only apply to Heroku apps for now
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ft-next-session-client",
"version": "1.1.8",
"version": "0.0.0",
"description": "",
"main": "main.js",
"directories": {
Expand Down Expand Up @@ -35,6 +35,7 @@
"karma-phantomjs-launcher": "^0.1.4",
"lintspaces-cli": "^0.4.0",
"mocha": "^2.2.4",
"npm-prepublish": "^1.2.1",
"origami-build-tools": "^2.13.0",
"sinon": "^1.14.1"
}
Expand Down

0 comments on commit c0c4446

Please sign in to comment.