From 7ee8410d87a44a8291289c736fc81afc4d140964 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 20 Jul 2021 16:13:46 +0200 Subject: [PATCH] We don't use Travis anymore. Git can be used to recover these files if they're needed in the future. --- .travis.yml | 86 ----------------------- README.md | 1 - doc/doxygen/inside_release.doc | 2 +- doc/doxygen/inside_tests.doc | 23 +----- sonar-project.properties | 3 - tools/internal/check_dist_archive.exclude | 1 - tools/internal/travis-sonarqube.sh | 59 ---------------- tools/jenkins/project_description.sh | 35 --------- 8 files changed, 3 insertions(+), 207 deletions(-) delete mode 100644 .travis.yml delete mode 100755 tools/internal/travis-sonarqube.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 8f1a2bde4f..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,86 +0,0 @@ -# NS3 is disabled because the version in ubuntu precise does not lead -# to the same timings (precision error?) -# Reenable with -# cmake -Denable_ns3 -# apt-get libns3-dev ns3 -# -# -dist: bionic -language: cpp -compiler: - - gcc -# - clang -jdk: - - openjdk11 -addons: - apt: - packages: - - cmake - - valgrind - - gfortran - - libboost-dev - - libboost-all-dev - - libdw-dev - - libevent-dev - - libunwind8-dev - - pybind11-dev - homebrew: - packages: - - python - coverity_scan: - project: - name: "simgrid/simgrid" - description: "Build submitted via Travis CI" - notification_email: martin.quinson@ens-rennes.fr - build_command_prepend: "cmake -Denable_documentation=OFF -Denable_coverage=ON -Denable_java=OFF -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=OFF ." - build_command: "make VERBOSE=1" - branch_pattern: coverity - -jobs: - include: - - os: linux - script: - - sudo apt-get update -qq - - sudo apt-get install cmake valgrind gfortran libboost-dev libboost-all-dev libdw-dev libevent-dev libunwind8-dev pybind11-dev - - (cmake -Denable_model-checking=ON -Denable_documentation=OFF -Denable_coverage=ON -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON -DLTO_EXTRA_FLAG="auto" . || (echo XXX CMakeOutput.log; cat /home/travis/build/simgrid/simgrid/CMakeFiles/CMakeOutput.log; echo XXX CMakeError.log;cat /home/travis/build/simgrid/simgrid/CMakeFiles/CMakeError.log; exit 1)) - - make -j$(nproc) VERBOSE=1 all && make -j$(nproc) tests && ctest -j$(nproc) --output-on-failure - - os: windows - script: - - mv "C:/Program Files/Git/usr/bin/sh.exe" "sh-ignored.exe" - - df -h - - du -hs /tmp || true - - choco install boost-msvc-12 python jdk8 - - export CC=gcc - - export CXX=g++ - - export PATH='C:\Python39':'C:\local\boost_1_58_0':$PATH - - export BOOST_LIBRARYDIR='C:/local/boost_1_58_0/lib64-msvc-12.0' - - export BOOST_INCLUDEDIR='C:/local/boost_1_58_0/include' - - export JAVA_HOME='C:/Program Files/Java/jdk1.8.0_211' - # We need pybind11. SimGrid will pick it automatically if the subdir is here - # - git clone --depth=1 https://github.com/pybind/pybind11.git - - cmake -G "MinGW Makefiles" -Denable_java=ON -Denable_msg=ON -Denable_lua=OFF -Denable_documentation=OFF -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF . - - df -h - - du -hs /tmp || true - - mingw32-make.exe VERBOSE=1 java-all && ctest --output-on-failure -R java - # - mingw32-make.exe VERBOSE=1 python-bindings && ctest --output-on-failure -R python - - df -h - - du -hc /tmp || true - - os: osx - osx_image: xcode11.4 - script: - - export LIBRARY_PATH=/usr/local/lib/gcc/9 - - cmake -Denable_model-checking=OFF -Denable_documentation=OFF -Denable_coverage=ON -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON -Denable_lto=OFF . - - make -j2 VERBOSE=1 all && make -j2 tests && ctest -j2 --output-on-failure -notifications: - recipients: - - martin.quinson@ens-rennes.fr - email: - on_success: change - on_failure: always - irc: - on_success: change - on_failure: always - channels: - - "irc.debian.org#simgrid" - template: - - "%{repository}/%{branch} (%{commit} - %{author}): %{message}" diff --git a/README.md b/README.md index 1a9091edac..9268e195d0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](http://makeapullrequest.com) [![Build Status](https://ci.inria.fr/simgrid/buildStatus/icon?job=SimGrid)](https://ci.inria.fr/simgrid/job/SimGrid/) -[![Travis Status](https://img.shields.io/travis/simgrid/simgrid/master.svg?logo=travis)](https://travis-ci.org/simgrid/simgrid) [![AppVeyor Status](https://ci.appveyor.com/api/projects/status/gvcssh340fwtoc35?svg=true)](https://ci.appveyor.com/project/mquinson/simgrid) [![SonarCloud Status](https://sonarcloud.io/api/project_badges/measure?project=simgrid_simgrid&metric=alert_status)](https://sonarcloud.io/dashboard/?id=simgrid_simgrid) [![Doc](https://readthedocs.org/projects/pip/badge/?version=stable)](https://simgrid.org/doc/latest/) diff --git a/doc/doxygen/inside_release.doc b/doc/doxygen/inside_release.doc index db98d17b4f..00ee2d39d6 100644 --- a/doc/doxygen/inside_release.doc +++ b/doc/doxygen/inside_release.doc @@ -22,7 +22,7 @@ Please apply the following checklist before releasing. - The release dub name matches the one given in ChangeLog file - Tests - The "make distcheck" target works (tested by jenkins) - - All tests pass on everything on ci + travis/macOS + AppVeyor + - All tests pass on everything on ci + AppVeyor - Tutorials and derivative projects build correctly https://framagit.org/simgrid/simgrid-template-s4u/pipelines https://framagit.org/simgrid/external-projects-ci/pipelines diff --git a/doc/doxygen/inside_tests.doc b/doc/doxygen/inside_tests.doc index e7aba36bbb..43617ab625 100644 --- a/doc/doxygen/inside_tests.doc +++ b/doc/doxygen/inside_tests.doc @@ -138,9 +138,7 @@ We use Jenkins on Inria servers as a workhorse: it runs all of our tests for many configurations. It takes a long time to answer, and it often reports issues but when it's green, then you know that SimGrid is very fit! -We use Travis to -quickly run some tests on Linux and Mac. It answers quickly but may -miss issues. And we use AppVeyor +We use AppVeyor to build and somehow test SimGrid on windows. @subsection inside_tests_jenkins Jenkins on the Inria CI servers @@ -205,23 +203,9 @@ pkg install boost-libs cmake openjdk8 automake libxslt libxml2 libunwind git hto brew install cmake boost libunwind-headers libxslt git python3 @endverbatim -@subsection inside_tests_travis Travis - -Travis is a free (as in free beer) Continuous Integration system that -open-sourced project can use freely. It is very well integrated in the -GitHub ecosystem. There is a plenty of documentation out there. Our -configuration is in the file .travis.yml as it should be, and the -result is here: https://travis-ci.org/simgrid/simgrid - -The .travis.yml configuration file can be useful if you fail to get -SimGrid to compile on modern mac systems. We use the @c brew package -manager there, and it works like a charm. - @subsection inside_tests_appveyor AppVeyor -AppVeyor aims at becoming the Travis of Windows. It is maybe less -mature than Travis, or maybe it is just that I'm less trained in -Windows. Our configuration is in the file appveyor.yml as it should +Our configuration is in the file appveyor.yml as it should be, and the result is here: https://ci.appveyor.com/project/mquinson/simgrid We use @c Choco as a package manager on AppVeyor, and it is sufficient @@ -252,7 +236,4 @@ open-source project can use it at no cost. That is what we are doing. Don't miss the great looking dashboard here: https://sonarcloud.io/dashboard?id=simgrid_simgrid -This tool is enriched by the script @c tools/internal/travis-sonarqube.sh -that is run from @c .travis.yml - */ diff --git a/sonar-project.properties b/sonar-project.properties index 70aada3979..b87ed17934 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -208,9 +208,6 @@ sonar.sourceEncoding=UTF-8 sonar.java.source=8 sonar.java.binaries=CMakeFiles/simgrid-java_jar.dir,examples/deprecated/java -# Don't talk to me: travis don't like your verbosity -# sonar.verbose=true - ### NOTE: the following properties are overridden by Jenkins configuration ### #sonar.java.binaries diff --git a/tools/internal/check_dist_archive.exclude b/tools/internal/check_dist_archive.exclude index 1b08e656d8..8cf4bb6b3a 100644 --- a/tools/internal/check_dist_archive.exclude +++ b/tools/internal/check_dist_archive.exclude @@ -21,7 +21,6 @@ + \.lgtm\.yml + \.project + \.readthedocs.yml -+ \.travis\.yml + sonar-project\.properties + contrib/.* diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh deleted file mode 100755 index eeb0b44051..0000000000 --- a/tools/internal/travis-sonarqube.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/env sh - -# Install and run SonarQube on travis. -# -# Use it as a wrapper to your build command, eg: ./travis-sonarqube.sh make VERBOSE=1 - -# On macOS or with pull requests, you don't want to run SonarQube but to exec the build command directly. - -# Be verbose and fail fast -set -ex - -# Install required software -installSonarQubeScanner() { - SONAR_SCANNER_VERSION=3.2.0.1227 - export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION - rm -rf $SONAR_SCANNER_HOME - mkdir -p $SONAR_SCANNER_HOME - curl -sSLo $HOME/.sonar/sonar-scanner.zip http://repo1.maven.org/maven2/org/sonarsource/scanner/cli/sonar-scanner-cli/$SONAR_SCANNER_VERSION/sonar-scanner-cli-$SONAR_SCANNER_VERSION.zip - unzip $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/ - rm $HOME/.sonar/sonar-scanner.zip - export PATH=$SONAR_SCANNER_HOME/bin:$PATH - export SONAR_SCANNER_OPTS="-server" -} -installBuildWrapper() { - curl -LsS https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip > build-wrapper-linux-x86.zip - unzip build-wrapper-linux-x86.zip -} -installSonarQubeScanner -installBuildWrapper - -# triggers the compilation through the build wrapper to gather compilation database -./build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-outputs "$@" - -# Run ctest before sonar to gather coverage some information -# EDIT: Don't run the tests on travis because they take too much time. -#set +e -#ctest -j2 --output-on-failure -#outcome=$? -#set -e -outcome=0 - -# Only run sonar on master (not on pull requests) -if [ "$TRAVIS_PULL_REQUEST" != "false" ] ; then - exit $outcome -fi - -# generate the gcov files -#ctest -D ExperimentalCoverage - -# and finally execute the actual SonarQube analysis -# (the SONAR_TOKEN is set from the travis web interface, to not expose it with an ongoing "set -x") -# See https://docs.travis-ci.com/user/sonarqube/ for more info on tokens -# don't show the token in the logs -set +x -sonar-scanner -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN 2>&1 \ - | grep -v 'INFO: Parsing /home/travis/build/simgrid/simgrid/Testing/CoverageInfo' \ - | grep -v 'WARN: File not analysed by Sonar, so ignoring coverage: /usr/include/' - -exit $outcome diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh index 529ed1910f..cd019ca223 100755 --- a/tools/jenkins/project_description.sh +++ b/tools/jenkins/project_description.sh @@ -173,41 +173,6 @@ do 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 3)) -OS=($(curl -s https://api.travis-ci.org/repos/simgrid/simgrid/builds/"${BUILD_NUM}" | grep -o '"os":"[a-z]*",' | sed 's/"os":"\([a-z]*\)",/\1/g'| 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 [ "${OS[$id]}" == "linux" ]; then - node="travis-linux (log)" - os="Ubuntu 18.04 bionic" - elif [ "${OS[$id]}" == "osx" ]; then - node="travis-mac (log)" - os="Mac OS X Catalina (10.15) " - elif [ "${OS[$id]}" == "windows" ]; then - node="travis-windows (log)" - os="Windows Server 1809" - fi - boost=$(get_boost) - compiler=$(get_compiler) - java=$(get_java) - cmake=$(get_cmake) - ns3=$(get_ns3) - py=$(get_python) - success=$(grep -m 1 "Your build exited with 0" ./consoleText) - ball="red.png" - if [ -n "$success" ]; then - ball="blue.png" - fi - echo " $node$os$compiler$boost$java$cmake$ns3$py" - 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 -- 2.20.1