Fixed Travis CI build handling. (#8288)
* Fixed Travis CI build handling. We need to properly quote YAML metacharacters. * Update pre-generated dashboard.js.
Austin S. Hemmelgarn committed
Mar 4, 2020 at 12:35 UTC
281fd893d0b5d48bf9f0df688b85c95ba236e450
2 files changed
+6
-6
.travis.yml
+1
-1
@@ -170,7 +170,7 @@ jobs:
170
after_failure: post_message "TRAVIS_MESSAGE" "Build/Install failed on ubuntu 18.04"
171
172
- name: Run netdata lifecycle, on ubuntu 18.04 (Containerized)
173
- script: for i in $(seq 0 4); do printf "[XXX: Run #%s]\n" "$i"; docker run -it -v "${PWD}:/netdata:rw" -w /netdata "netdata/os-test:ubuntu1804" bats --tap tests/lifecycle.bats && break; sleep 15; done
173
+ script: 'for i in $(seq 0 4); do printf "[XXX: Run #%s]\n" "$i"; docker run -it -v "${PWD}:/netdata:rw" -w /netdata "netdata/os-test:ubuntu1804" bats --tap tests/lifecycle.bats && break; sleep 15; done'
174
after_failure: post_message "TRAVIS_MESSAGE" "Netdata lifecycle test script failed on ubuntu 18.04"
175
176
- name: Run netdata lifecycle from stable to current, on CentOS 7 (Containerized)
web/gui/dashboard.js
+5
-5
@@ -7944,7 +7944,7 @@ let chartState = function (element) {
7944
hide: NETDATA.options.current.show_help_delay_hide_ms
7945
},
7946
title: 'Pan Right',
7947
- content: 'Pan the chart to the right. You can also <b>drag it</b> with your mouse or your finger (on touch devices).<br/><small>Help, can be disabled from the settings.</small>'
7947
+ content: 'Pan the chart to the right. You can also <b>drag it</b> with your mouse or your finger (on touch devices).<br/><small>Help can be disabled from the settings.</small>'
7948
});
7949
}
7950
@@ -7970,7 +7970,7 @@ let chartState = function (element) {
7970
hide: NETDATA.options.current.show_help_delay_hide_ms
7971
},
7972
title: 'Chart Zoom In',
7973
- content: 'Zoom in the chart. You can also press SHIFT and select an area of the chart, or press SHIFT or ALT and use the mouse wheel or 2-finger touchpad scroll to zoom in or out.<br/><small>Help, can be disabled from the settings.</small>'
7973
+ content: 'Zoom in the chart. You can also press SHIFT and select an area of the chart, or press SHIFT or ALT and use the mouse wheel or 2-finger touchpad scroll to zoom in or out.<br/><small>Help can be disabled from the settings.</small>'
7974
});
7975
}
7976
@@ -7997,7 +7997,7 @@ let chartState = function (element) {
7997
hide: NETDATA.options.current.show_help_delay_hide_ms
7998
},
7999
title: 'Chart Zoom Out',
8000
- content: 'Zoom out the chart. You can also press SHIFT or ALT and use the mouse wheel, or 2-finger touchpad scroll to zoom in or out.<br/><small>Help, can be disabled from the settings.</small>'
8000
+ content: 'Zoom out the chart. You can also press SHIFT or ALT and use the mouse wheel, or 2-finger touchpad scroll to zoom in or out.<br/><small>Help can be disabled from the settings.</small>'
8001
});
8002
}
8003
@@ -8029,7 +8029,7 @@ let chartState = function (element) {
8029
hide: NETDATA.options.current.show_help_delay_hide_ms
8030
},
8031
title: 'Chart Resize',
8032
- content: 'Drag this point with your mouse or your finger (on touch devices), to resize the chart vertically. You can also <b>double click it</b> or <b>double tap it</b> to reset between 2 states: the default and the one that fits all the values.<br/><small>Help, can be disabled from the settings.</small>'
8032
+ content: 'Drag this point with your mouse or your finger (on touch devices), to resize the chart vertically. You can also <b>double click it</b> or <b>double tap it</b> to reset between 2 states: the default and the one that fits all the values.<br/><small>Help can be disabled from the settings.</small>'
8033
});
8034
}
8035
@@ -8089,7 +8089,7 @@ let chartState = function (element) {
8089
show: NETDATA.options.current.show_help_delay_show_ms,
8090
hide: NETDATA.options.current.show_help_delay_hide_ms
8091
},
8092
- content: 'You can click or tap on the values or the labels to select dimensions. By pressing SHIFT or CONTROL, you can enable or disable multiple dimensions.<br/><small>Help, can be disabled from the settings.</small>'
8092
+ content: 'You can click or tap on the values or the labels to select dimensions. By pressing SHIFT or CONTROL, you can enable or disable multiple dimensions.<br/><small>Help can be disabled from the settings.</small>'
8093
});
8094
}
8095
} else {