From 994c1c38ef56d76f02876a25fe4e61cd0fd5b790 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Sun, 7 Jul 2019 00:32:29 +0200 Subject: [PATCH] update description to remove appveyor and add travis-windows --- tools/jenkins/project_description.sh | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh index afc1a8c2f4..f44d99a177 100755 --- a/tools/jenkins/project_description.sh +++ b/tools/jenkins/project_description.sh @@ -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) High Sierra (kernel: 17.4.0) " + 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 "" -- 2.20.1