X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88a2fea01fe6b01e02c4ec8752affa512ba27050..dd5a3529268771a43f81e95067b48d618127975c:/tools/jenkins/project_description.sh

diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh
index b1f9d04c51..f493cb94f4 100755
--- a/tools/jenkins/project_description.sh
+++ b/tools/jenkins/project_description.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 get_boost(){
     grep -m 1 "Boost version:" ./consoleText | sed  "s/.*-- Boost version: \([a-zA-Z0-9\.]*\)/\1/g"
@@ -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
@@ -45,7 +45,7 @@ fi
 
 #get the list of nodes on jenkins
 wget --quiet ${BUILD_URL}/consoleText >/dev/null 2>&1
-nodes=($(grep -rR "Triggering SimGrid ? Debug," ./consoleText | sed "s/Triggering SimGrid ? Debug,\(.*\)/\1/g"| sort))
+nodes=($(sed -n 's/^Triggering SimGrid [^ ]* Debug,//p' ./consoleText| sort))
 rm consoleText
 
 
@@ -68,10 +68,10 @@ function compareVersion(v1, v2) {
 <script>
 function sortTable(n, type) {
   var table, rows, switching, i, x, y, shouldSwitch, dir, switchcount = 0;
-  table = document.getElementById("configuration-matrix");
+  table = document.getElementById('configuration-matrix');
   switching = true;
   //Set the sorting direction to ascending:
-  dir = "asc"; 
+  dir = 'asc'; 
   /*Make a loop that will continue until
   no switching has been done:*/
   while (switching) {
@@ -85,18 +85,18 @@ function sortTable(n, type) {
       shouldSwitch = false;
       /*Get the two elements you want to compare,
       one from current row and one from the next:*/
-      x = rows[i].getElementsByTagName("TD")[n];
-      y = rows[i + 1].getElementsByTagName("TD")[n];
+      x = rows[i].getElementsByTagName('TD')[n];
+      y = rows[i + 1].getElementsByTagName('TD')[n];
       /*check if the two rows should switch place,
       based on the direction, asc or desc:*/
-      if (dir == "asc") {
-        if(type == "version"){
+      if (dir == 'asc') {
+        if(type == 'version'){
           shouldSwitch = (compareVersion(x.innerHTML.toLowerCase(), y.innerHTML.toLowerCase()) > 0);
         }else{
           shouldSwitch = (x.innerHTML.toLowerCase() > y.innerHTML.toLowerCase());
         }
-      } else if (dir == "desc") {
-        if(type == "version"){
+      } else if (dir == 'desc') {
+        if(type == 'version'){
           shouldSwitch = (compareVersion(x.innerHTML.toLowerCase(), y.innerHTML.toLowerCase()) < 0);
         }else{
           shouldSwitch = (x.innerHTML.toLowerCase() < y.innerHTML.toLowerCase());
@@ -113,17 +113,17 @@ function sortTable(n, type) {
       //Each time a switch is done, increase this count by 1:
       switchcount ++;      
     } else {
-      /*If no switching has been done AND the direction is "asc",
-      set the direction to "desc" and run the while loop again.*/
-      if (switchcount == 0 && dir == "asc") {
-        dir = "desc";
+      /*If no switching has been done AND the direction is 'asc',
+      set the direction to 'desc' and run the while loop again.*/
+      if (switchcount == 0 && dir == 'asc') {
+        dir = 'desc';
         switching = true;
       }
     }
   }
 }</script>
 <table id=configuration-matrix> 
-<tr class=matrix-row>  <td class=matrix-header style=min-width:75px onclick='sortTable(0);'>Name of the Builder</td><td class=matrix-header style=min-width:75px onclick='sortTable(1);'>OS</td><td class=matrix-header style=min-width:75px onclick='sortTable(2);'>Compiler</td><td class=matrix-header style=min-width:75px onclick='sortTable(3, 'version');'>Boost</td><td class=matrix-header style=min-width:75px onclick='sortTable(4,'version');'>Java</td><td class=matrix-header style=min-width:75px onclick='sortTable(5,'version');'>Cmake</td><td class=matrix-header style=min-width:50px onclick='sortTable(6);'>NS3</td><td class=matrix-header style=min-width:50px onclick='sortTable(7);'>Python</td></tr>"
+<tr class=matrix-row>  <td class=matrix-header style=min-width:75px onclick='sortTable(0);'>Name of the Builder</td><td class=matrix-header style=min-width:75px onclick='sortTable(1);'>OS</td><td class=matrix-header style=min-width:75px onclick='sortTable(2);'>Compiler</td><td class=matrix-header style=min-width:75px onclick=\"sortTable(3, 'version');\">Boost</td><td class=matrix-header style=min-width:75px onclick=\"sortTable(4,'version');\">Java</td><td class=matrix-header style=min-width:75px onclick=\"sortTable(5,'version');\">Cmake</td><td class=matrix-header style=min-width:50px onclick='sortTable(6);'>ns-3</td><td class=matrix-header style=min-width:50px onclick='sortTable(7);'>Python</td></tr>"
 
 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="<a href=\"https://travis-ci.org/simgrid/simgrid\">travis-linux</a>"
-      os="Ubuntu 16.04 (<a href=\"https://docs.travis-ci.com/user/reference/xenial/\">Xenial</a>) 64 bits"
-    else
-      node="<a href=\"https://travis-ci.org/simgrid/simgrid\">travis-mac</a>"
-      os="Mac OSX High Sierra (kernel: 17.4.0)"
+      node="<a href=\"https://travis-ci.org/simgrid/simgrid/jobs/${BUILDS[$id]}\">travis-linux</a>"
+      os="Ubuntu 16.04 (<a href=\"https://docs.travis-ci.com/user/reference/xenial/\">xenial</a>) 64 bits"
+    elif [ $id == 1 ]; then
+      node="<a href=\"https://travis-ci.org/simgrid/simgrid/jobs/${BUILDS[$id]}\">travis-mac</a>"
+      os="(<a href=\"https://docs.travis-ci.com/user/reference/osx/\">Mac OSX</a>) Mojave (10.14) "
+    elif [ $id == 2 ]; then
+      node="<a href=\"https://travis-ci.org/simgrid/simgrid/jobs/${BUILDS[$id]}\">travis-windows</a>"
+      os="(<a href=\"https://docs.travis-ci.com/user/reference/windows/\">Windows</a>) 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="<a href="https://ci.appveyor.com/project/mquinson/simgrid">appveyor</a>"
-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 "<tr> <td class=\"matrix-leftcolumn\">$node</td><td class=\"matrix-cell\" style=\"text-align:left\">$os</td><td class=\"matrix-cell\" style=\"text-align:left\">$compiler</td><td class=\"matrix-cell\" style=\"text-align:left\">$boost</td><td class=\"matrix-cell\" style=\"text-align:left\">$java</td><td class=\"matrix-cell\" style=\"text-align:left\">$cmake</td><td class=\"matrix-cell\" style=\"text-align:center\">$ns3</td><td class=\"matrix-cell\" style=\"text-align:center\">$py</td></tr>"
-rm consoleText
-
 echo "</table>"