Test integrity of dashboard.js (#4715)
* releaser needs to be on branch and not in deteached state * dashboard.js integrity test; fix configure.ac * fix key in travis config * fix builder image name * verbose diff * revert #4707
Paweł Krupa committed
Nov 23, 2018 at 00:10 UTC
8d9085717923caef25f5194ba1138bc1e5381fcb
5 files changed
+9
-12
.travis.yml
+2
@@ -19,6 +19,8 @@ jobs:
19
install: sudo apt-get install -y libcap2-bin zlib1g-dev uuid-dev fakeroot libipmimonitoring-dev libmnl-dev libnetfilter-acct-dev
20
script: fakeroot ./netdata-installer.sh --install $HOME --dont-wait --dont-start-it --enable-plugin-nfacct --enable-plugin-freeipmi --disable-lto && $HOME/netdata/usr/sbin/netdata -W unittest
21
env: CFLAGS='-O1 -DNETDATA_INTERNAL_CHECKS=1 -DNETDATA_VERIFY_LOCKS=1'
22
+ - name: dashboard.js
23
+ script: cp web/gui/dashboard.js /tmp/dashboard.js && ./build/build.sh && diff /tmp/dashboard.js web/gui/dashboard.js
24
- name: coverity
25
install: sudo apt-get install -y zlib1g-dev uuid-dev libipmimonitoring-dev libmnl-dev libnetfilter-acct-dev
26
script: ./coverity-scan.sh || echo "Coverity failed :("
.travis/releaser.sh
+2
@@ -34,6 +34,8 @@ export GIT_USER="netdatabot"
34
echo "--- Initialize git configuration ---"
35
git config user.email "${GIT_MAIL}"
36
git config user.name "${GIT_USER}"
37
+git checkout master
38
+git pull
39
40
echo "---- FIGURING OUT TAGS ----"
41
# tagger.sh is sourced since we need environment variables it sets
build/build.sh
+4
-4
@@ -10,13 +10,13 @@ if [ "$IS_CONTAINER" != "" ]; then
10
make dist
11
rm -rf autom4te.cache
12
else
13
- if [[ "$(docker images -q netdata-gcc-builder:latest 2> /dev/null)" == "" ]]; then
14
- docker build -t netdata-gcc-builder:latest -f build/Dockerfile .
13
+ if [[ "$(docker images -q netdata-builder:latest 2> /dev/null)" == "" ]]; then
14
+ docker build -t netdata-builder:latest -f build/Dockerfile .
15
fi
16
docker run --rm -it \
17
--env IS_CONTAINER=TRUE \
18
--volume "${PWD}:/project:Z" \
19
--workdir "/project" \
20
- netdata:gcc \
21
- ./.travis/build.sh
20
+ netdata-builder:latest \
21
+ ./build/build.sh
22
fi
configure.ac
+1
-1
@@ -6,7 +6,7 @@ AC_PREREQ(2.60)
6
7
define([VERSION_MAJOR], [1])
8
define([VERSION_MINOR], [11])
9
-define([VERSION_FIX], [0])
9
+define([VERSION_FIX], [1])
10
define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
11
define([VERSION_SUFFIX], [_rolling])
12
web/gui/dashboard.js
-7
@@ -805,13 +805,6 @@ NETDATA.unitsConversion = {
805
'GB/s': 1024 * 1024,
806
'TB/s': 1024 * 1024 * 1024
807
},
808
- 'B': {
809
- 'B': 1,
810
- 'KB': 1024,
811
- 'MB': 1024 * 1024,
812
- 'GB': 1024 * 1024 * 1024,
813
- 'TB': 1024 * 1024 * 1024 * 1024,
814
- 'PB': 1024 * 1024 * 1024 * 1024 * 1024
808
'KB': {
809
'B': 1 / 1024,
810
'KB': 1,