From e6b29036426a4ad5116d761f73ddc8c9de1d7e13 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 24 Jul 2022 01:12:13 +0100 Subject: [PATCH 01/13] More grunt debugging --- .travis-ci.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index 57aae890..e6df7327 100644 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -14,11 +14,11 @@ BLACKLIST if [[ $TASK = 'nosetests' ]]; then nosetests --verbosity=3 --detailed-errors elif [[ $TASK = 'karma' ]]; then - grunt --verbose unit-test + grunt --verbose --debug --stack unit-test elif [[ $TASK = 'lint' ]]; then - grunt --verbose lint + grunt --verbose --debug --stack lint elif [[ $TASK = 'closure-compiler' ]]; then - grunt --verbose closure-compiler + grunt --verbose --debug --stack closure-compiler elif [[ $TASK = 'data-check' ]]; then ./tools/make_manufacturer_data.sh > data/manufacturer_data.py && git diff --exit-code data/manufacturer_data.py elif [[ $TASK = 'spellintian' ]]; then From ddf1a569a0654da311b5f4b0dfaf0d10282e6041 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 24 Jul 2022 01:17:05 +0100 Subject: [PATCH 02/13] Try and fix the Travis build --- .travis.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 72dff21f..6f9d0d53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,33 @@ language: python before_cache: -- rm -f $HOME/.cache/pip/log/debug.log # erase log + - rm -f $HOME/.cache/pip/log/debug.log # erase log cache: + apt: true + npm: true + pip: true directories: - $HOME/.npm - $HOME/.cache/pip +before_install: + #Switch node to the latest LTS version + - if [ "$TASK" = "karma" -o "$TASK" = "lint" -o "$TASK" = "closure-compiler" ]; then nvm install lts/* && nvm use lts/*; fi + install: - if [ "$TASK" = "nosetests" -o "$TASK" = "flake8" -o "$TASK" = "flake8-wip" ]; then pip install json-spec; fi - - if [ "$TASK" = "karma" -o "$TASK" = "lint" -o "$TASK" = "closure-compiler" ]; then npm install -g grunt-cli; fi - - if [ "$TASK" = "karma" -o "$TASK" = "lint" -o "$TASK" = "closure-compiler" ]; then npm install; fi + - if [ "$TASK" = "karma" -o "$TASK" = "lint" -o "$TASK" = "closure-compiler" ]; then npm --verbose install -g grunt-cli; fi + - if [ "$TASK" = "karma" -o "$TASK" = "lint" -o "$TASK" = "closure-compiler" ]; then grunt --version --verbose; fi + - if [ "$TASK" = "karma" -o "$TASK" = "lint" -o "$TASK" = "closure-compiler" ]; then npm --verbose install; fi - if [ "$TASK" = "flake8" -o "$TASK" = "flake8-wip" ]; then pip install flake8; fi # If this causes SSL errors, then Sourceforge is probably in disaster recovery mode and needing Javascript. Could switch to a specific mirror, e.g. kent.dl.sourceforge.net - if [ "$TASK" = "pychecker" -o "$TASK" = "pychecker-wip" ]; then pip install http://sourceforge.net/projects/pychecker/files/pychecker/0.8.19/pychecker-0.8.19.tar.gz/download; fi - if [ "$TASK" = "codespell" ]; then pip install git+https://github.com/codespell-project/codespell.git; fi +after_failure: +- if [ -f /home/travis/.npm/_logs/*-debug.log ]; then cat /home/travis/.npm/_logs/*-debug.log; fi + matrix: fast_finish: true include: From dc720a4165a0abf6876e084e6ec470779e6129ad Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 24 Jul 2022 01:38:08 +0100 Subject: [PATCH 03/13] Update some npm versions --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a1b21dfa..4251875f 100644 --- a/package.json +++ b/package.json @@ -18,20 +18,20 @@ "google-closure-library": "^20170910.0.0", "grunt": "^1.0.0", "grunt-bower-task": "~0.4.0", - "grunt-contrib-clean": "~0.6.0", + "grunt-contrib-clean": "~2.0.1", "grunt-contrib-copy": "~0.8.0", "grunt-contrib-jshint": "^0.12.0", "grunt-contrib-uglify": "~0.9.1", "grunt-contrib-watch": "~0.6.1", "grunt-jscs": "^1.8.0", "grunt-karma": "^0.12.2", - "grunt-stylelint": "^0.13.0", + "grunt-stylelint": "^0.16.0", "karma": "^1.6.0", "karma-chrome-launcher": "~0.1", "karma-firefox-launcher": "~0.1", "karma-jasmine": "~0.2.0", - "olp-javascript-style": "openlightingproject/javascript-style", - "stylelint": "^12.0.1", - "stylelint-config-recommended": "^3.0.0" + "olp-javascript-style": "git://github.com/OpenLightingProject/javascript-style", + "stylelint": "^13.8.0", + "stylelint-config-recommended": "^5.0.0" } } From fd84d1cd9f2c4a70be8c9dc695305d99321f2109 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 24 Jul 2022 01:45:12 +0100 Subject: [PATCH 04/13] Bump grunt-contrib-watch version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4251875f..873de4a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rdm-app", - "version": "0.1.0", + "version": "0.1.1", "repository": "OpenLightingProject/rdm-app", "author": { "name": "Open Lighting Project", @@ -22,7 +22,7 @@ "grunt-contrib-copy": "~0.8.0", "grunt-contrib-jshint": "^0.12.0", "grunt-contrib-uglify": "~0.9.1", - "grunt-contrib-watch": "~0.6.1", + "grunt-contrib-watch": "~1.1.0", "grunt-jscs": "^1.8.0", "grunt-karma": "^0.12.2", "grunt-stylelint": "^0.16.0", From a6998bc300bb655d2268776413ba2c64ee94bb52 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 24 Jul 2022 01:50:36 +0100 Subject: [PATCH 05/13] Bump grunt-jscs version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 873de4a8..fb2acf3b 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "grunt-contrib-jshint": "^0.12.0", "grunt-contrib-uglify": "~0.9.1", "grunt-contrib-watch": "~1.1.0", - "grunt-jscs": "^1.8.0", + "grunt-jscs": "^3.0.1", "grunt-karma": "^0.12.2", "grunt-stylelint": "^0.16.0", "karma": "^1.6.0", From d01a41ba65d80c0775f370e2f5918d5f5d6cff61 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 24 Jul 2022 01:56:52 +0100 Subject: [PATCH 06/13] Remove a jscs option that's on by default --- Gruntfile.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 2e14f04a..3ed5e70c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -77,7 +77,6 @@ module.exports = function(grunt) { 'unit-test-js/tests/*js' ], options: { - verbose: true, config: true } }, From 0bbfaa1cda3801cbec8a85a791729fbcd163d0ee Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 24 Jul 2022 02:03:27 +0100 Subject: [PATCH 07/13] Fix a typo in some comments --- Gruntfile.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 3ed5e70c..4a628c6b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -27,7 +27,7 @@ module.exports = function(grunt) { build: { files: [{ dest: './static/js/rdm.js', - src: './js_src/rdm.js'//TODO(dave): change this to ./js_scr/*js + src: './js_src/rdm.js'//TODO(dave): change this to ./js_src/*js }], options: { mangle: true, @@ -61,7 +61,7 @@ module.exports = function(grunt) { jshint: { dev: [ 'Gruntfile.js', - 'js_src/rdm.js',//TODO(dave): change this to ./js_scr/*js + 'js_src/rdm.js',//TODO(dave): change this to ./js_src/*js 'unit-test-js/karma.conf.js', 'unit-test-js/tests/*js' ], @@ -72,7 +72,7 @@ module.exports = function(grunt) { jscs: { src: [ 'Gruntfile.js', - 'js_src/rdm.js',//TODO(dave): change this to ./js_scr/*js + 'js_src/rdm.js',//TODO(dave): change this to ./js_src/*js 'unit-test-js/karma.conf.js', 'unit-test-js/tests/*js' ], From 12f6cb05d886eccfd725700f42f9c03c99be3603 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 24 Jul 2022 02:10:22 +0100 Subject: [PATCH 08/13] Update grunt-bower-task --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fb2acf3b..93760358 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "google-closure-compiler": "^20170910.0.0", "google-closure-library": "^20170910.0.0", "grunt": "^1.0.0", - "grunt-bower-task": "~0.4.0", + "grunt-bower-task": "~0.6.2", "grunt-contrib-clean": "~2.0.1", "grunt-contrib-copy": "~0.8.0", "grunt-contrib-jshint": "^0.12.0", From de448903001caec7f5c05e52689557e3e9993b4f Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 24 Jul 2022 02:18:09 +0100 Subject: [PATCH 09/13] Bump karma related package versions --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 93760358..5d3a4983 100644 --- a/package.json +++ b/package.json @@ -24,12 +24,12 @@ "grunt-contrib-uglify": "~0.9.1", "grunt-contrib-watch": "~1.1.0", "grunt-jscs": "^3.0.1", - "grunt-karma": "^0.12.2", + "grunt-karma": "^4.0.2", "grunt-stylelint": "^0.16.0", - "karma": "^1.6.0", - "karma-chrome-launcher": "~0.1", - "karma-firefox-launcher": "~0.1", - "karma-jasmine": "~0.2.0", + "karma": "^6.4.0", + "karma-chrome-launcher": "~3.1.1", + "karma-firefox-launcher": "~2.1.2", + "karma-jasmine": "~5.1.0", "olp-javascript-style": "git://github.com/OpenLightingProject/javascript-style", "stylelint": "^13.8.0", "stylelint-config-recommended": "^5.0.0" From 8f89cb0a8d29b87378f6186490804d9c6e03b26d Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 24 Jul 2022 02:29:22 +0100 Subject: [PATCH 10/13] Enable Firefox via the Travis addon for use with karma --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6f9d0d53..d77b6eb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,8 @@ matrix: dist: focal arch: arm64 env: TASK="karma" + addons: + firefox: latest services: - xvfb - os: linux From db3014b6f134d9f9fc572d702295d0a8622112a1 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 24 Jul 2022 02:38:09 +0100 Subject: [PATCH 11/13] Mozilla doesn't currently support nightly arm64 builds, so install Firefox via apt instead --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d77b6eb3..b82244b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,8 +39,13 @@ matrix: dist: focal arch: arm64 env: TASK="karma" + # Mozilla doesn't currently support nightly arm64 builds, so install via apt instead + #addons: + # firefox: latest addons: - firefox: latest + apt: + packages: + - firefox services: - xvfb - os: linux From 98bbeb27907db98bde8d7814041f761ceef85256 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 24 Jul 2022 02:49:34 +0100 Subject: [PATCH 12/13] Make Firefox work in headless mode for Karma --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b82244b3..e046bee6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,11 @@ matrix: - os: linux dist: focal arch: arm64 - env: TASK="karma" + env: + - TASK="karma" + global: + # Make Firefox headless + - MOZ_HEADLESS=1 # Mozilla doesn't currently support nightly arm64 builds, so install via apt instead #addons: # firefox: latest From dddcec864533c5db876368b366b5e2a3f9a08d1c Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 24 Jul 2022 02:56:38 +0100 Subject: [PATCH 13/13] Fix the MOZ_HEADLESS env var config --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e046bee6..27d42c2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,9 +40,8 @@ matrix: arch: arm64 env: - TASK="karma" - global: - # Make Firefox headless - - MOZ_HEADLESS=1 + # Make Firefox headless + - MOZ_HEADLESS=1 # Mozilla doesn't currently support nightly arm64 builds, so install via apt instead #addons: # firefox: latest