From e1b7877c24a9c79bd645524a46fc134fd6a25d9c Mon Sep 17 00:00:00 2001 From: Clement Michaud Date: Sat, 13 May 2017 18:32:25 +0200 Subject: [PATCH] Fix packaging in travis --- .travis.yml | 6 ++++-- Gruntfile.js | 6 ++++++ package.json | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b1d4832f4..b2f8cca8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,10 @@ addons: before_install: npm install -g npm@'>=2.13.5' script: -- npm test -- docker build -t clems4ever/authelia . +- npm install +- grunt test +- grunt build +- grunt docker-build - docker-compose build - docker-compose up -d - sleep 5 diff --git a/Gruntfile.js b/Gruntfile.js index f5a6b6589..4b2484052 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -13,6 +13,10 @@ module.exports = function(grunt) { "test": { cmd: "npm", args: ['run', 'test'] + }, + "docker-build": { + cmd: "docker", + args: ['build', '-t', 'clems4ever/authelia', '.'] } }, copy: { @@ -43,7 +47,9 @@ module.exports = function(grunt) { grunt.registerTask('default', ['build']); grunt.registerTask('res', ['copy:resources', 'copy:views', 'copy:public_html']); + grunt.registerTask('build', ['run:tslint', 'run:build-ts', 'res']); + grunt.registerTask('docker-build', ['run:docker-build']); grunt.registerTask('test', ['run:test']); }; diff --git a/package.json b/package.json index 8d52213a2..cca2cb965 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "sinon-promise": "^0.1.3", "tmp": "0.0.31", "ts-node": "^3.0.4", - "tslint": "^5.2.0" + "tslint": "^5.2.0", + "typescript": "^2.3.2" } }