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

Commit

Permalink
Merge pull request #145 from Financial-Times/adambraimbridge-patch-1
Browse files Browse the repository at this point in the history
Linting and consistency
  • Loading branch information
Adam Braimbridge authored Feb 2, 2017
2 parents 30f7cb5 + 35a2e6b commit cd3e56e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ watc%: dev-n-ui ## watch: Watch for static asset changes.
ci-n-ui-check:
# In CircleCI
ifneq ($(CIRCLE_BUILD_NUM),)
# The app is using n-ui
# The app is using n-ui
ifneq ($(shell grep -s -Fim 1 n-ui bower.json),)
# versions in package.json and bower.json are not equal
# versions in package.json and bower.json are not equal
ifneq ($(shell grep -s -Fim 1 version bower_components/n-ui/.bower.json),$(shell grep -s -Fim 1 version node_modules/@financial-times/n-ui/package.json))
$(error 'Projects using n-ui must maintain parity between versions. Rebuild without cache and update your bower.json and package.json if necessary')
$(error 'Projects using n-ui must maintain parity between versions. Rebuild without cache and update your bower.json and package.json if necessary')
endif
endif
endif
Expand Down

0 comments on commit cd3e56e

Please sign in to comment.