X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/295d1ac801bf16a9b053d09a32882a03f911aac5..dd5a3529268771a43f81e95067b48d618127975c:/tools/jenkins/project_description.sh
diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh
index 4cd5829d38..f493cb94f4 100755
--- a/tools/jenkins/project_description.sh
+++ b/tools/jenkins/project_description.sh
@@ -17,7 +17,7 @@ get_cmake(){
}
get_ns3(){
- found=$(grep -c "NS-3 found" ./consoleText)
+ found=$(grep -c "ns-3 found" ./consoleText)
if [ $found != 0 ]; then
echo "â"
else
@@ -123,7 +123,7 @@ function sortTable(n, type) {
}
}
-
"
+
"
for node in "${nodes[@]}"
do
@@ -146,18 +146,21 @@ done
#Travis - get ID of the last jobs with the API
BUILD_NUM=$(curl -s 'https://api.travis-ci.org/repos/simgrid/simgrid/builds?limit=1' | grep -o '^\[{"id":[0-9]*,' | grep -o '[0-9]' | tr -d '\n')
-BUILDS=($(curl -s https://api.travis-ci.org/repos/simgrid/simgrid/builds/${BUILD_NUM} | grep -o '{"id":[0-9]*,' | grep -o '[0-9]*'| tail -n 2))
+BUILDS=($(curl -s https://api.travis-ci.org/repos/simgrid/simgrid/builds/${BUILD_NUM} | grep -o '{"id":[0-9]*,' | grep -o '[0-9]*'| tail -n 3))
for id in "${!BUILDS[@]}"
do
wget --quiet https://api.travis-ci.org/v3/job/${BUILDS[$id]}/log.txt -O ./consoleText >/dev/null 2>&1
sed -i -e "s/\r//g" ./consoleText
if [ $id == 0 ]; then
- node="travis-linux"
+ node="travis-linux"
os="Ubuntu 16.04 (xenial) 64 bits"
- else
- node="travis-mac"
- os="Mac OSX High Sierra (kernel: 17.4.0)"
+ elif [ $id == 1 ]; then
+ node="travis-mac"
+ os="(Mac OSX) Mojave (10.14) "
+ elif [ $id == 2 ]; then
+ node="travis-windows"
+ os="(Windows) 10 v17134"
fi
boost=$(get_boost)
compiler=$(get_compiler)
@@ -169,19 +172,4 @@ do
rm consoleText
done
-#Appveyor - get ID of the last job with the API
-BUILD_ID=$(curl -s "https://ci.appveyor.com/api/projects/mquinson/simgrid" | grep -o '\[{"jobId":"[a-zA-Z0-9]*",' | sed "s/\[{\"jobId\":\"//" | sed "s/\",//")
-wget --quiet https://ci.appveyor.com/api/buildjobs/$BUILD_ID/log -O ./consoleText >/dev/null 2>&1
-sed -i -e "s/\r//g" ./consoleText
-node="appveyor"
-os="Windows Server 2012 - VS2015 + mingw64 5.3.0"
-boost=$(get_boost)
-compiler=$(get_compiler)
-java=$(get_java)
-cmake=$(get_cmake)
-ns3=$(get_ns3)
-py=$(get_python)
-echo " $node | $os | $compiler | $boost | $java | $cmake | $ns3 | $py |
"
-rm consoleText
-
echo "
"