Skip to content

Commit

Permalink
Fixed Travis CI build handling. (netdata#8288)
Browse files Browse the repository at this point in the history
* Fixed Travis CI build handling.

We need to properly quote YAML metacharacters.

* Update pre-generated dashboard.js.
  • Loading branch information
Ferroin authored Mar 4, 2020
1 parent 72d3583 commit 281fd89
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ jobs:
after_failure: post_message "TRAVIS_MESSAGE" "Build/Install failed on ubuntu 18.04"

- name: Run netdata lifecycle, on ubuntu 18.04 (Containerized)
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
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'
after_failure: post_message "TRAVIS_MESSAGE" "Netdata lifecycle test script failed on ubuntu 18.04"

- name: Run netdata lifecycle from stable to current, on CentOS 7 (Containerized)
Expand Down
10 changes: 5 additions & 5 deletions web/gui/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -7944,7 +7944,7 @@ let chartState = function (element) {
hide: NETDATA.options.current.show_help_delay_hide_ms
},
title: 'Pan Right',
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>'
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>'
});
}

Expand All @@ -7970,7 +7970,7 @@ let chartState = function (element) {
hide: NETDATA.options.current.show_help_delay_hide_ms
},
title: 'Chart Zoom In',
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>'
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>'
});
}

Expand All @@ -7997,7 +7997,7 @@ let chartState = function (element) {
hide: NETDATA.options.current.show_help_delay_hide_ms
},
title: 'Chart Zoom Out',
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>'
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>'
});
}

Expand Down Expand Up @@ -8029,7 +8029,7 @@ let chartState = function (element) {
hide: NETDATA.options.current.show_help_delay_hide_ms
},
title: 'Chart Resize',
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>'
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>'
});
}

Expand Down Expand Up @@ -8089,7 +8089,7 @@ let chartState = function (element) {
show: NETDATA.options.current.show_help_delay_show_ms,
hide: NETDATA.options.current.show_help_delay_hide_ms
},
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>'
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>'
});
}
} else {
Expand Down

0 comments on commit 281fd89

Please sign in to comment.