From 36df3ce581499365f6418d204da7b6e9ee6b43d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristram=20Gr=C3=A4bener?= Date: Mon, 28 Aug 2017 15:14:15 +0200 Subject: [PATCH 1/4] Remove the unused gitlab configuration --- .gitlab-ci.yml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 2a678ef..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,10 +0,0 @@ -build site: - image: node:8 - stage: build - script: - - npm install --progress=false - - npm run build - artifacts: - expire_in: 1 week - paths: - - dist From c769031502a73858374705aad811cc4dc3748750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristram=20Gr=C3=A4bener?= Date: Mon, 28 Aug 2017 15:14:29 +0200 Subject: [PATCH 2/4] Add the travis-ci configuration --- .travis.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..4f0a09e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,11 @@ +language: node_js +node_js: + - node +before_script: + - yarn +cache: + directories: + - "node_modules" +script: + - npm run build + - npm run lint From c2641a89c6718886d6565534262e8275882ce64d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristram=20Gr=C3=A4bener?= Date: Mon, 4 Sep 2017 17:54:39 +0200 Subject: [PATCH 3/4] Return 1 on build failure --- build/webpack.prod.conf.js | 5 +++-- package.json | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index da44b65..ff3e975 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -8,7 +8,7 @@ var CopyWebpackPlugin = require('copy-webpack-plugin') var HtmlWebpackPlugin = require('html-webpack-plugin') var ExtractTextPlugin = require('extract-text-webpack-plugin') var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') - +var failPlugin = require('webpack2-fail-plugin'); var env = config.build.env var webpackConfig = merge(baseWebpackConfig, { @@ -90,7 +90,8 @@ var webpackConfig = merge(baseWebpackConfig, { to: config.build.assetsSubDirectory, ignore: ['.*'] } - ]) + ]), + failPlugin ] }) diff --git a/package.json b/package.json index 5b535e3..c84b2b2 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,8 @@ "vue-chartjs": "^2.7.1", "vue-floatthead": "^0.0.5", "vue-json-tree-view": "^2.0.7", - "vue-router": "^2.2.0" + "vue-router": "^2.2.0", + "webpack2-fail-plugin": "^1.0.7" }, "devDependencies": { "autoprefixer": "^6.7.2", From 5e760feb604818973e0183a65f9ec14535e66763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristram=20Gr=C3=A4bener?= Date: Mon, 4 Sep 2017 18:11:59 +0200 Subject: [PATCH 4/4] Travis: use the example config for building --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4f0a09e..383610b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,6 @@ cache: directories: - "node_modules" script: + - ln -s matchIdConfig.example matchIdConfig - npm run build - npm run lint