From 3b2fcbe16eddacbd615edb3f91a4ac6fc9083898 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Wed, 7 Oct 2015 19:14:09 +0200 Subject: [PATCH 1/3] tried to fix .gitlab-ci.yml --- .gitlab-ci.yml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc9ce76..32ae9cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,23 @@ # This file is generated by GitLab CI -Npm, Bower, Grunt: +stages: + - clean + - build + +cleanup: + stage: clean script: - - npm install - - bower install - - grunt + - rm -r node_modules + - rm -r bower_components + tags: + except: + - tags + +Npm, Bower, Grunt: + stage: build + script: + - npm install + - bower install + - grunt tags: except: - - tags + - tags From 04afcad428e3df2aae6cca9e1c95e48bd977f505 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Wed, 7 Oct 2015 19:16:03 +0200 Subject: [PATCH 2/3] okay, so deleting these dirs is not required --- .gitlab-ci.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32ae9cf..2abfa9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,19 +1,4 @@ -# This file is generated by GitLab CI -stages: - - clean - - build - -cleanup: - stage: clean - script: - - rm -r node_modules - - rm -r bower_components - tags: - except: - - tags - Npm, Bower, Grunt: - stage: build script: - npm install - bower install From 2daf130c68b86cdb3096092a2ead0c4f1fdf61be Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Wed, 7 Oct 2015 19:43:41 +0200 Subject: [PATCH 3/3] updated all dependencies to the latest available versions and re-generated some files in dist/ --- bower.json | 4 ++-- dist/libs.js | 2 +- dist/libs.min.js | 6 +++--- dist/uhr.min.css | 2 +- package.json | 28 ++++++++++++++-------------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/bower.json b/bower.json index 524469d..561f1d7 100644 --- a/bower.json +++ b/bower.json @@ -7,7 +7,7 @@ "jquery-cookie": "~1.4.1" }, "devDependencies": { - "mocha": "~2.1.0", - "chai": "~1.10.0" + "mocha": "~2.3.3", + "chai": "~3.3.0" } } diff --git a/dist/libs.js b/dist/libs.js index d4e614a..a47ea5d 100644 --- a/dist/libs.js +++ b/dist/libs.js @@ -1,4 +1,4 @@ -/*! uhr - v8.0.2-dev.0 - 2015-07-15 +/*! uhr - v8.0.2-dev.0 - 2015-10-07 * http://bärneruhr.ch/ * Copyright (c) 2015 Manuel Friedli; Licensed GPL-3.0 */ /*! diff --git a/dist/libs.min.js b/dist/libs.min.js index d984f1b..89122af 100644 --- a/dist/libs.min.js +++ b/dist/libs.min.js @@ -1,6 +1,6 @@ -/*! uhr - v8.0.2-dev.0 - 2015-07-15 +/*! uhr - v8.0.2-dev.0 - 2015-10-07 * http://bärneruhr.ch/ * Copyright (c) 2015 Manuel Friedli; Licensed GPL-3.0 */ -!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){function c(a){var b="length"in a&&a.length,c=_.type(a);return"function"===c||_.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}function d(a,b,c){if(_.isFunction(b))return _.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return _.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(ha.test(b))return _.filter(b,a,c);b=_.filter(b,a)}return _.grep(a,function(a){return U.call(b,a)>=0!==c})}function e(a,b){for(;(a=a[b])&&1!==a.nodeType;);return a}function f(a){var b=oa[a]={};return _.each(a.match(na)||[],function(a,c){b[c]=!0}),b}function g(){Z.removeEventListener("DOMContentLoaded",g,!1),a.removeEventListener("load",g,!1),_.ready()}function h(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=_.expando+h.uid++}function i(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(ua,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:ta.test(c)?_.parseJSON(c):c}catch(e){}sa.set(a,b,c)}else c=void 0;return c}function j(){return!0}function k(){return!1}function l(){try{return Z.activeElement}catch(a){}}function m(a,b){return _.nodeName(a,"table")&&_.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function n(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function o(a){var b=Ka.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function p(a,b){for(var c=0,d=a.length;d>c;c++)ra.set(a[c],"globalEval",!b||ra.get(b[c],"globalEval"))}function q(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(ra.hasData(a)&&(f=ra.access(a),g=ra.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)_.event.add(b,e,j[e][c])}sa.hasData(a)&&(h=sa.access(a),i=_.extend({},h),sa.set(b,i))}}function r(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&_.nodeName(a,b)?_.merge([a],c):c}function s(a,b){var c=b.nodeName.toLowerCase();"input"===c&&ya.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}function t(b,c){var d,e=_(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:_.css(e[0],"display");return e.detach(),f}function u(a){var b=Z,c=Oa[a];return c||(c=t(a,b),"none"!==c&&c||(Na=(Na||_("