diff options
author | Marco Poletti <poletti.marco@gmail.com> | 2022-11-14 18:41:04 -0800 |
---|---|---|
committer | Marco Poletti <poletti.marco@gmail.com> | 2022-11-14 18:41:04 -0800 |
commit | d23dd5603a572d34dcf903b8a0f57824f282ba83 (patch) | |
tree | 5742d7d0e9bd94d8f36851605c74d8c899e2cf13 | |
parent | 9bd5df14d63806888cb67aa209061a02bcbd4529 (diff) | |
download | google-fruit-d23dd5603a572d34dcf903b8a0f57824f282ba83.tar.gz |
Remove config files for Travis CI and Appveyor, and update docs to mention Github actions instead.
-rw-r--r-- | .github/workflows/test-on-osx.yml | 2 | ||||
-rw-r--r-- | .travis.yml | 329 | ||||
-rw-r--r-- | CONTRIBUTING.md | 28 | ||||
-rw-r--r-- | appveyor.yml | 67 | ||||
-rwxr-xr-x | extras/scripts/ci_install_linux.sh (renamed from extras/scripts/travis_ci_install_linux.sh) | 0 | ||||
-rwxr-xr-x | extras/scripts/ci_install_osx.sh (renamed from extras/scripts/travis_ci_install_osx.sh) | 0 | ||||
-rwxr-xr-x | extras/scripts/travis_yml_generator.py | 251 |
7 files changed, 9 insertions, 668 deletions
diff --git a/.github/workflows/test-on-osx.yml b/.github/workflows/test-on-osx.yml index bc529d6..c5ba6ba 100644 --- a/.github/workflows/test-on-osx.yml +++ b/.github/workflows/test-on-osx.yml @@ -86,7 +86,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: install - run: extras/scripts/travis_ci_install_osx.sh + run: extras/scripts/ci_install_osx.sh - name: test run: extras/scripts/postsubmit.sh ${{ matrix.config.test }} - name: Setup tmate session diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 50045e3..0000000 --- a/.travis.yml +++ /dev/null @@ -1,329 +0,0 @@ -# -# This file was auto-generated from extras/scripts/travis_yml_generator.py, DO NOT EDIT -# -branches: - only: - - master -dist: xenial -language: cpp -matrix: - fast_finish: true - include: - - compiler: gcc - env: COMPILER=gcc-10 UBUNTU=20.10 TEST=ReleasePlain - install: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.10'; extras/scripts/postsubmit.sh - ReleasePlain - - compiler: gcc - env: COMPILER=gcc-10 UBUNTU=20.10 TEST=DebugPlain - install: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.10'; extras/scripts/postsubmit.sh - DebugPlain - - compiler: clang - env: COMPILER=clang-8.0 STL=libstdc++ UBUNTU=20.10 TEST=ReleasePlain - install: export OS=linux; export COMPILER='clang-8.0'; export STL='libstdc++'; - export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-8.0'; export STL='libstdc++'; - export UBUNTU='20.10'; extras/scripts/postsubmit.sh ReleasePlain - - compiler: clang - env: COMPILER=clang-8.0 STL=libstdc++ UBUNTU=20.10 TEST=DebugAsanUbsan - install: export OS=linux; export COMPILER='clang-8.0'; export STL='libstdc++'; - export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-8.0'; export STL='libstdc++'; - export UBUNTU='20.10'; extras/scripts/postsubmit.sh DebugAsanUbsan - - compiler: clang - env: COMPILER=clang-8.0 STL=libstdc++ UBUNTU=20.10 TEST=DebugPlain - install: export OS=linux; export COMPILER='clang-8.0'; export STL='libstdc++'; - export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-8.0'; export STL='libstdc++'; - export UBUNTU='20.10'; extras/scripts/postsubmit.sh DebugPlain - - compiler: clang - env: COMPILER=clang-6.0 STL=libstdc++ UBUNTU=20.04 TEST=ReleasePlain - install: export OS=linux; export COMPILER='clang-6.0'; export STL='libstdc++'; - export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-6.0'; export STL='libstdc++'; - export UBUNTU='20.04'; extras/scripts/postsubmit.sh ReleasePlain - - compiler: clang - env: COMPILER=clang-6.0 STL=libstdc++ UBUNTU=20.04 TEST=DebugAsanUbsan - install: export OS=linux; export COMPILER='clang-6.0'; export STL='libstdc++'; - export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-6.0'; export STL='libstdc++'; - export UBUNTU='20.04'; extras/scripts/postsubmit.sh DebugAsanUbsan - - compiler: clang - env: COMPILER=clang-6.0 STL=libstdc++ UBUNTU=20.04 TEST=DebugPlain - install: export OS=linux; export COMPILER='clang-6.0'; export STL='libstdc++'; - export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-6.0'; export STL='libstdc++'; - export UBUNTU='20.04'; extras/scripts/postsubmit.sh DebugPlain - - compiler: gcc - env: COMPILER=bazel UBUNTU=18.04 - install: export OS=linux; export COMPILER='bazel'; export UBUNTU='18.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='bazel'; export UBUNTU='18.04'; extras/scripts/postsubmit.sh - DebugPlain - - compiler: gcc - env: COMPILER=gcc-7 UBUNTU=20.10 TEST=ReleasePlain - install: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.10'; extras/scripts/postsubmit.sh - ReleasePlain - - compiler: gcc - env: COMPILER=gcc-7 UBUNTU=20.10 TEST=DebugAsanUbsan - install: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.10'; extras/scripts/postsubmit.sh - DebugAsanUbsan - - compiler: gcc - env: COMPILER=gcc-10 UBUNTU=20.10 TEST=DebugAsanUbsan - install: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='gcc-10'; export UBUNTU='20.10'; extras/scripts/postsubmit.sh - DebugAsanUbsan - - compiler: clang - env: COMPILER=clang-11.0 STL=libstdc++ UBUNTU=20.10 TEST=ReleasePlain - install: export OS=linux; export COMPILER='clang-11.0'; export STL='libstdc++'; - export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-11.0'; export STL='libstdc++'; - export UBUNTU='20.10'; extras/scripts/postsubmit.sh ReleasePlain - - compiler: clang - env: COMPILER=clang-11.0 STL=libstdc++ UBUNTU=20.10 TEST=DebugAsanUbsan - install: export OS=linux; export COMPILER='clang-11.0'; export STL='libstdc++'; - export UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-11.0'; export STL='libstdc++'; - export UBUNTU='20.10'; extras/scripts/postsubmit.sh DebugAsanUbsan - - compiler: clang - env: COMPILER=clang-11.0 STL=libc++ UBUNTU=20.10 TEST=ReleasePlain - install: export OS=linux; export COMPILER='clang-11.0'; export STL='libc++'; export - UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-11.0'; export STL='libc++'; export - UBUNTU='20.10'; extras/scripts/postsubmit.sh ReleasePlain - - compiler: clang - env: COMPILER=clang-11.0 STL=libc++ UBUNTU=20.10 TEST=DebugAsanUbsan - install: export OS=linux; export COMPILER='clang-11.0'; export STL='libc++'; export - UBUNTU='20.10'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-11.0'; export STL='libc++'; export - UBUNTU='20.10'; extras/scripts/postsubmit.sh DebugAsanUbsan - - compiler: gcc - env: COMPILER=gcc-7 UBUNTU=20.04 TEST=ReleasePlain - install: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/postsubmit.sh - ReleasePlain - - compiler: gcc - env: COMPILER=gcc-7 UBUNTU=20.04 TEST=DebugAsanUbsan - install: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='gcc-7'; export UBUNTU='20.04'; extras/scripts/postsubmit.sh - DebugAsanUbsan - - compiler: gcc - env: COMPILER=gcc-5 UBUNTU=18.04 TEST=ReleasePlain - install: export OS=linux; export COMPILER='gcc-5'; export UBUNTU='18.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='gcc-5'; export UBUNTU='18.04'; extras/scripts/postsubmit.sh - ReleasePlain - - compiler: gcc - env: COMPILER=gcc-5 UBUNTU=18.04 TEST=DebugPlain - install: export OS=linux; export COMPILER='gcc-5'; export UBUNTU='18.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='gcc-5'; export UBUNTU='18.04'; extras/scripts/postsubmit.sh - DebugPlain - - compiler: gcc - env: COMPILER=gcc-8 UBUNTU=18.04 TEST=ReleasePlain - install: export OS=linux; export COMPILER='gcc-8'; export UBUNTU='18.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='gcc-8'; export UBUNTU='18.04'; extras/scripts/postsubmit.sh - ReleasePlain - - compiler: gcc - env: COMPILER=gcc-8 UBUNTU=18.04 TEST=DebugPlain - install: export OS=linux; export COMPILER='gcc-8'; export UBUNTU='18.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='gcc-8'; export UBUNTU='18.04'; extras/scripts/postsubmit.sh - DebugPlain - - compiler: clang - env: COMPILER=clang-3.9 STL=libstdc++ UBUNTU=18.04 TEST=ReleasePlain - install: export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++'; - export UBUNTU='18.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++'; - export UBUNTU='18.04'; extras/scripts/postsubmit.sh ReleasePlain - - compiler: clang - env: COMPILER=clang-3.9 STL=libstdc++ UBUNTU=18.04 TEST=DebugAsanUbsan - install: export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++'; - export UBUNTU='18.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++'; - export UBUNTU='18.04'; extras/scripts/postsubmit.sh DebugAsanUbsan - - compiler: clang - env: COMPILER=clang-7.0 STL=libstdc++ UBUNTU=18.04 TEST=ReleasePlainNoPch - install: export OS=linux; export COMPILER='clang-7.0'; export STL='libstdc++'; - export UBUNTU='18.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-7.0'; export STL='libstdc++'; - export UBUNTU='18.04'; extras/scripts/postsubmit.sh ReleasePlainNoPch - - compiler: clang - env: COMPILER=clang-7.0 STL=libstdc++ UBUNTU=18.04 TEST=DebugAsanUbsanNoPch - install: export OS=linux; export COMPILER='clang-7.0'; export STL='libstdc++'; - export UBUNTU='18.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-7.0'; export STL='libstdc++'; - export UBUNTU='18.04'; extras/scripts/postsubmit.sh DebugAsanUbsanNoPch - - compiler: gcc - env: COMPILER=gcc-5 UBUNTU=16.04 TEST=ReleasePlain - install: export OS=linux; export COMPILER='gcc-5'; export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='gcc-5'; export UBUNTU='16.04'; extras/scripts/postsubmit.sh - ReleasePlain - - compiler: gcc - env: COMPILER=gcc-5 UBUNTU=16.04 TEST=DebugPlain - install: export OS=linux; export COMPILER='gcc-5'; export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='gcc-5'; export UBUNTU='16.04'; extras/scripts/postsubmit.sh - DebugPlain - - compiler: clang - env: COMPILER=clang-3.5 STL=libstdc++ UBUNTU=16.04 TEST=ReleasePlain - install: export OS=linux; export COMPILER='clang-3.5'; export STL='libstdc++'; - export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-3.5'; export STL='libstdc++'; - export UBUNTU='16.04'; extras/scripts/postsubmit.sh ReleasePlain - - compiler: clang - env: COMPILER=clang-3.5 STL=libstdc++ UBUNTU=16.04 TEST=DebugPlain - install: export OS=linux; export COMPILER='clang-3.5'; export STL='libstdc++'; - export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-3.5'; export STL='libstdc++'; - export UBUNTU='16.04'; extras/scripts/postsubmit.sh DebugPlain - - compiler: clang - env: COMPILER=clang-3.9 STL=libstdc++ UBUNTU=16.04 TEST=ReleasePlain - install: export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++'; - export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++'; - export UBUNTU='16.04'; extras/scripts/postsubmit.sh ReleasePlain - - compiler: clang - env: COMPILER=clang-3.9 STL=libstdc++ UBUNTU=16.04 TEST=DebugPlain - install: export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++'; - export UBUNTU='16.04'; extras/scripts/travis_ci_install_linux.sh - os: linux - script: export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++'; - export UBUNTU='16.04'; extras/scripts/postsubmit.sh DebugPlain - - compiler: gcc - env: COMPILER=gcc-6 TEST=ReleasePlainNoClangTidy - install: export OS=osx; export COMPILER='gcc-6'; travis_wait extras/scripts/travis_ci_install_osx.sh - os: osx - osx_image: xcode11.4 - script: export OS=osx; export COMPILER='gcc-6'; extras/scripts/postsubmit.sh ReleasePlainNoClangTidy - - compiler: gcc - env: COMPILER=gcc-6 TEST=DebugPlainNoClangTidy - install: export OS=osx; export COMPILER='gcc-6'; travis_wait extras/scripts/travis_ci_install_osx.sh - os: osx - osx_image: xcode11.4 - script: export OS=osx; export COMPILER='gcc-6'; extras/scripts/postsubmit.sh DebugPlainNoClangTidy - - compiler: gcc - env: COMPILER=gcc-9 TEST=ReleasePlainNoPchNoClangTidy - install: export OS=osx; export COMPILER='gcc-9'; travis_wait extras/scripts/travis_ci_install_osx.sh - os: osx - osx_image: xcode11.4 - script: export OS=osx; export COMPILER='gcc-9'; extras/scripts/postsubmit.sh ReleasePlainNoPchNoClangTidy - - compiler: gcc - env: COMPILER=gcc-9 TEST=DebugPlainNoPchNoClangTidy - install: export OS=osx; export COMPILER='gcc-9'; travis_wait extras/scripts/travis_ci_install_osx.sh - os: osx - osx_image: xcode11.4 - script: export OS=osx; export COMPILER='gcc-9'; extras/scripts/postsubmit.sh DebugPlainNoPchNoClangTidy - - compiler: clang - env: COMPILER=clang-6.0 STL=libc++ TEST=ReleasePlainNoClangTidy - install: export OS=osx; export COMPILER='clang-6.0'; export STL='libc++'; travis_wait - extras/scripts/travis_ci_install_osx.sh - os: osx - osx_image: xcode11.4 - script: export OS=osx; export COMPILER='clang-6.0'; export STL='libc++'; extras/scripts/postsubmit.sh - ReleasePlainNoClangTidy - - compiler: clang - env: COMPILER=clang-6.0 STL=libc++ TEST=DebugAsanUbsanNoClangTidy - install: export OS=osx; export COMPILER='clang-6.0'; export STL='libc++'; travis_wait - extras/scripts/travis_ci_install_osx.sh - os: osx - osx_image: xcode11.4 - script: export OS=osx; export COMPILER='clang-6.0'; export STL='libc++'; extras/scripts/postsubmit.sh - DebugAsanUbsanNoClangTidy - - compiler: clang - env: COMPILER=clang-8.0 STL=libc++ TEST=ReleasePlainNoPchNoClangTidy - install: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; travis_wait - extras/scripts/travis_ci_install_osx.sh - os: osx - osx_image: xcode11.4 - script: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; extras/scripts/postsubmit.sh - ReleasePlainNoPchNoClangTidy - - compiler: clang - env: COMPILER=clang-8.0 STL=libc++ TEST=DebugAsanUbsanNoPchNoClangTidy - install: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; travis_wait - extras/scripts/travis_ci_install_osx.sh - os: osx - osx_image: xcode11.4 - script: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; extras/scripts/postsubmit.sh - DebugAsanUbsanNoPchNoClangTidy - - compiler: clang - env: COMPILER=clang-8.0 STL=libc++ TEST=DebugPlainNoPchNoClangTidy - install: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; travis_wait - extras/scripts/travis_ci_install_osx.sh - os: osx - osx_image: xcode11.4 - script: export OS=osx; export COMPILER='clang-8.0'; export STL='libc++'; extras/scripts/postsubmit.sh - DebugPlainNoPchNoClangTidy - - compiler: clang - env: COMPILER=clang-default STL=libc++ TEST=ReleasePlainNoClangTidy - install: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; - travis_wait extras/scripts/travis_ci_install_osx.sh - os: osx - osx_image: xcode9.4 - script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh - ReleasePlainNoClangTidy - - compiler: clang - env: COMPILER=clang-default STL=libc++ TEST=DebugAsanUbsanNoClangTidy - install: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; - travis_wait extras/scripts/travis_ci_install_osx.sh - os: osx - osx_image: xcode9.4 - script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh - DebugAsanUbsanNoClangTidy - - compiler: clang - env: COMPILER=clang-default STL=libc++ TEST=ReleasePlainNoPchNoClangTidy - install: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; - travis_wait extras/scripts/travis_ci_install_osx.sh - os: osx - osx_image: xcode11.3 - script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh - ReleasePlainNoPchNoClangTidy - - compiler: clang - env: COMPILER=clang-default STL=libc++ TEST=DebugAsanUbsanNoPchNoClangTidy - install: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; - travis_wait extras/scripts/travis_ci_install_osx.sh - os: osx - osx_image: xcode11.3 - script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh - DebugAsanUbsanNoPchNoClangTidy - - compiler: clang - env: COMPILER=clang-default STL=libc++ TEST=DebugPlainNoPchNoClangTidy - install: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; - travis_wait extras/scripts/travis_ci_install_osx.sh - os: osx - osx_image: xcode11.3 - script: export OS=osx; export COMPILER='clang-default'; export STL='libc++'; extras/scripts/postsubmit.sh - DebugPlainNoPchNoClangTidy -services: -- docker -sudo: required - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1415516..eba9d1a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,25 +35,15 @@ py.test-3 -n auto ### Continuous Integration (CI) -Fruit uses Travis CI for continuous integration. You can see the latest CI runs in Travis CI -[here](https://travis-ci.org/google/fruit/builds). The CI configuration is defined in -`extras/scripts/travis_yml_generator.py`, that generates a `.travis.yml` file (which must also be checked in, due to the -way Travis CI is configured). +Fruit uses Github actions for continuous integration. You can see the latest CI runs in Github +[here](https://github.com/google/fruit/actions). The CI configuration is defined in +`.github/workflows`. -When editing the `travis_yml_generator.py` script you should also update the `.travis.yml` file (in the same commit) -by running: +Fruit tests run as Github actions run in various configurations/environments, notably: -```bash -cd $PATH_TO_FRUIT -extras/scripts/travis_yml_generator.py >.travis.yml -``` - -Fruit tests run in Travis CI in various configurations/environments, notably: - -* In Linux or OS X -* In various Ubuntu versions -* Using GCC or Clang -* Optionally running under Valgrind +* In Linux, OS X and Windows +* In various OS versions +* Using GCC, Clang, Apple-Clang or MSVC * Optionally running with ASan/UBSan * Using CMake or Bazel @@ -62,7 +52,7 @@ These tests run after every commit in master and for every pull request (as soon Linux tests run in Docker, using a set of images built for this purpose ([list of images](https://hub.docker.com/r/polettimarco/fruit-basesystem/tags/)). -If a test fails in Travis CI in some configuration, look at the beginning of the Travis CI Job log for a line such as: +If a test fails in CI in some configuration, look at the beginning of the CI Job log for a line such as: ```bash export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++'; export UBUNTU='16.04'; extras/scripts/postsubmit.sh DebugValgrind @@ -91,8 +81,6 @@ To speed up the execution of `postsubmit.sh` you can also set the `NJOBS` variab export NJOBS=16; export OS=linux; export COMPILER='clang-3.9'; export STL='libstdc++'; export UBUNTU='16.04'; extras/scripts/postsubmit.sh DebugValgrind ``` -The default number of jobs (used in Travis CI) is 2. - ### How to run Fruit tests on Windows You can import Fruit in Visual Studio (2017 and later) as a CMake project. You need to set the relevant CMake flags in diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 2406142..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,67 +0,0 @@ -version: 1.0.{build} -clone_folder: C:\Fruit -environment: - PYTHON3_PATH: C:\Python36 - matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CMAKE_GENERATOR: 'Visual Studio 16 2019' - VCVARSALL_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build' - ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DCMAKE_CXX_FLAGS="/WX /DFRUIT_DEBUG /DFRUIT_EXTRA_DEBUG /D_ITERATOR_DEBUG_LEVEL=2" -T host=x64 -A x64 -DCMAKE_CXX_STANDARD=17' - CONFIGURATION: Debug - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CMAKE_GENERATOR: 'Visual Studio 16 2019' - VCVARSALL_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build' - ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DCMAKE_CXX_FLAGS="/WX /DFRUIT_DEBUG /DFRUIT_EXTRA_DEBUG /D_ITERATOR_DEBUG_LEVEL=2" -T host=x64 -A x64' - CONFIGURATION: Debug - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - CMAKE_GENERATOR: 'Visual Studio 15 2017 Win64' - VCVARSALL_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build' - ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DCMAKE_CXX_FLAGS="/WX /DFRUIT_DEBUG /DFRUIT_EXTRA_DEBUG /D_ITERATOR_DEBUG_LEVEL=2" -T host=x64' - CONFIGURATION: Debug - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CMAKE_GENERATOR: 'Visual Studio 16 2019' - VCVARSALL_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build' - ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DCMAKE_CXX_FLAGS="/WX" -T host=x64 -A x64' - CONFIGURATION: Release - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - CMAKE_GENERATOR: 'Visual Studio 15 2017 Win64' - VCVARSALL_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build' - ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DCMAKE_CXX_FLAGS="/WX" -T host=x64' - CONFIGURATION: Release - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CMAKE_GENERATOR: 'Visual Studio 16 2019' - VCVARSALL_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build' - ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DBUILD_SHARED_LIBS=False -DCMAKE_CXX_FLAGS="/WX" -T host=x64 -A x64' - CONFIGURATION: Release - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - CMAKE_GENERATOR: 'Visual Studio 15 2017 Win64' - VCVARSALL_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build' - ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DBUILD_SHARED_LIBS=False -DCMAKE_CXX_FLAGS="/WX" -T host=x64' - CONFIGURATION: Release - - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - MINGW_PATH: 'C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin' - CMAKE_GENERATOR: 'MinGW Makefiles' - VCVARSALL_DIR: '' - ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DCMAKE_CXX_FLAGS="-Werror -DFRUIT_DEBUG=1 -DFRUIT_EXTRA_DEBUG=1 -D_GLIBCXX_DEBUG=1"' - CONFIGURATION: Debug - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - MINGW_PATH: 'C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin' - CMAKE_GENERATOR: 'MinGW Makefiles' - VCVARSALL_DIR: '' - ADDITIONAL_CMAKE_ARGS: '-DFRUIT_USES_BOOST=False -DCMAKE_CXX_FLAGS="-Werror"' - CONFIGURATION: Release - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - MINGW_PATH: 'C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin' - CMAKE_GENERATOR: 'MinGW Makefiles' - VCVARSALL_DIR: '' - ADDITIONAL_CMAKE_ARGS: '-DBoost_INCLUDE_DIR=C:\Libraries\boost_1_69_0 -DCMAKE_CXX_FLAGS="-Werror"' - CONFIGURATION: Release - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - MINGW_PATH: 'C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin' - CMAKE_GENERATOR: 'MinGW Makefiles' - VCVARSALL_DIR: '' - ADDITIONAL_CMAKE_ARGS: '-DBoost_INCLUDE_DIR=C:\Libraries\boost_1_69_0 -DBUILD_SHARED_LIBS=False -DCMAKE_CXX_FLAGS="-Werror"' - CONFIGURATION: Release -build_script: -- cmd: cmd /c C:\Fruit\extras\scripts\postsubmit.bat diff --git a/extras/scripts/travis_ci_install_linux.sh b/extras/scripts/ci_install_linux.sh index 708e5b9..708e5b9 100755 --- a/extras/scripts/travis_ci_install_linux.sh +++ b/extras/scripts/ci_install_linux.sh diff --git a/extras/scripts/travis_ci_install_osx.sh b/extras/scripts/ci_install_osx.sh index ec5f43d..ec5f43d 100755 --- a/extras/scripts/travis_ci_install_osx.sh +++ b/extras/scripts/ci_install_osx.sh diff --git a/extras/scripts/travis_yml_generator.py b/extras/scripts/travis_yml_generator.py deleted file mode 100755 index 46c5a92..0000000 --- a/extras/scripts/travis_yml_generator.py +++ /dev/null @@ -1,251 +0,0 @@ -#!/usr/bin/env python3 -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS-IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import yaml - -# "smoke tests" are run before other build matrix rows. -build_matrix_smoke_test_rows = [] -build_matrix_rows = [] - - -def determine_compiler_kind(compiler): - if compiler.startswith('gcc'): - return 'gcc' - elif compiler.startswith('clang'): - return 'clang' - else: - raise Exception('Unexpected compiler: %s' % compiler) - - -def determine_tests(asan, ubsan, clang_tidy, smoke_tests, use_precompiled_headers_in_tests, exclude_tests, - include_only_tests): - tests = [] - has_debug_build = False - tests += ['ReleasePlain'] - if asan: - has_debug_build = True - if ubsan: - tests += ['DebugAsanUbsan'] - else: - tests += ['DebugAsan'] - if ubsan and not asan: - raise Exception('Enabling UBSan but not ASan is not currently supported.') - if not has_debug_build: - tests += ['DebugPlain'] - for smoke_test in smoke_tests: - if smoke_test not in tests: - tests += [smoke_test] - excessive_excluded_tests = set(exclude_tests) - set(tests) - if excessive_excluded_tests: - raise Exception( - 'Some tests were excluded but were not going to run anyway: %s. ' - 'Tests to run (ignoring the possible NoPch/NoClangTidy prefixes): %s' - % (excessive_excluded_tests, tests)) - if include_only_tests is not None: - if exclude_tests != []: - raise Exception('Using exclude_tests and include_only_tests together is not supported.') - tests = include_only_tests - else: - tests = [test for test in tests if test not in exclude_tests] - if not use_precompiled_headers_in_tests: - tests = [test + 'NoPch' for test in tests] - if not clang_tidy: - tests = [test + 'NoClangTidy' for test in tests] - return tests - - -def generate_export_statements_for_env(env): - return ' '.join(['export %s=\'%s\';' % (var_name, value) for (var_name, value) in sorted(env.items())]) - - -def generate_env_string_for_env(env): - return ' '.join(['%s=%s' % (var_name, value) for (var_name, value) in sorted(env.items())]) - - -def add_ubuntu_tests(ubuntu_version, compiler, os='linux', stl=None, asan=True, ubsan=True, clang_tidy=True, - use_precompiled_headers_in_tests=True, smoke_tests=[], exclude_tests=[], include_only_tests=None): - env = { - 'UBUNTU': ubuntu_version, - 'COMPILER': compiler - } - if stl is not None: - env['STL'] = stl - compiler_kind = determine_compiler_kind(compiler) - export_statements = 'export OS=' + os + '; ' + generate_export_statements_for_env(env=env) - test_environment_template = {'os': 'linux', 'compiler': compiler_kind, - 'install': '%s extras/scripts/travis_ci_install_linux.sh' % export_statements} - tests = determine_tests(asan, ubsan, clang_tidy, smoke_tests, - use_precompiled_headers_in_tests=use_precompiled_headers_in_tests, - exclude_tests=exclude_tests, - include_only_tests=include_only_tests) - for test in tests: - test_environment = test_environment_template.copy() - test_environment['script'] = '%s extras/scripts/postsubmit.sh %s' % (export_statements, test) - # The TEST variable has no effect on the test run, but allows to see the test name in the Travis CI dashboard. - test_environment['env'] = generate_env_string_for_env(env) + " TEST=%s" % test - if test in smoke_tests: - build_matrix_smoke_test_rows.append(test_environment) - else: - build_matrix_rows.append(test_environment) - - -def add_osx_tests(compiler, xcode_version=None, stl=None, asan=True, ubsan=True, clang_tidy=True, - use_precompiled_headers_in_tests=True, smoke_tests=[], exclude_tests=[], include_only_tests=None): - env = {'COMPILER': compiler} - if stl is not None: - env['STL'] = stl - compiler_kind = determine_compiler_kind(compiler) - export_statements = 'export OS=osx; ' + generate_export_statements_for_env(env=env) - test_environment_template = {'os': 'osx', 'compiler': compiler_kind, - 'install': '%s travis_wait extras/scripts/travis_ci_install_osx.sh' % export_statements} - if xcode_version is not None: - test_environment_template['osx_image'] = 'xcode%s' % xcode_version - - tests = determine_tests(asan, ubsan, clang_tidy, smoke_tests, - use_precompiled_headers_in_tests=use_precompiled_headers_in_tests, - exclude_tests=exclude_tests, include_only_tests=include_only_tests) - for test in tests: - test_environment = test_environment_template.copy() - test_environment['script'] = '%s extras/scripts/postsubmit.sh %s' % (export_statements, test) - # The TEST variable has no effect on the test run, but allows to see the test name in the Travis CI dashboard. - test_environment['env'] = generate_env_string_for_env(env) + " TEST=%s" % test - if test in smoke_tests: - build_matrix_smoke_test_rows.append(test_environment) - else: - build_matrix_rows.append(test_environment) - - -def add_bazel_tests(ubuntu_version, smoke_tests=[]): - env = { - 'UBUNTU': ubuntu_version, - 'COMPILER': 'bazel', - } - test = 'DebugPlain' - export_statements = 'export OS=linux; ' + generate_export_statements_for_env(env=env) - test_environment = {'os': 'linux', - 'compiler': 'gcc', - 'env': generate_env_string_for_env(env), - 'install': '%s extras/scripts/travis_ci_install_linux.sh' % export_statements, - 'script': '%s extras/scripts/postsubmit.sh %s' % (export_statements, test)} - if test in smoke_tests: - build_matrix_smoke_test_rows.append(test_environment) - else: - build_matrix_rows.append(test_environment) - -add_ubuntu_tests(ubuntu_version='20.10', compiler='gcc-7') -add_ubuntu_tests(ubuntu_version='20.10', compiler='gcc-10', - smoke_tests=['DebugPlain', 'ReleasePlain']) -add_ubuntu_tests(ubuntu_version='20.10', compiler='clang-8.0', stl='libstdc++', - smoke_tests=['DebugPlain', 'DebugAsanUbsan', 'ReleasePlain']) -add_ubuntu_tests(ubuntu_version='20.10', compiler='clang-11.0', stl='libstdc++') -add_ubuntu_tests(ubuntu_version='20.10', compiler='clang-11.0', stl='libc++') - -add_ubuntu_tests(ubuntu_version='20.04', compiler='gcc-7') -add_ubuntu_tests(ubuntu_version='20.04', compiler='clang-6.0', stl='libstdc++', - smoke_tests=['DebugPlain', 'DebugAsanUbsan', 'ReleasePlain']) - -add_ubuntu_tests(ubuntu_version='18.04', compiler='gcc-5', asan=False, ubsan=False) -add_ubuntu_tests(ubuntu_version='18.04', compiler='gcc-8', asan=False, ubsan=False) -add_ubuntu_tests(ubuntu_version='18.04', compiler='clang-3.9', stl='libstdc++') -add_ubuntu_tests(ubuntu_version='18.04', compiler='clang-7.0', stl='libstdc++', - # Disabled due to https://bugs.llvm.org/show_bug.cgi?id=41625. - use_precompiled_headers_in_tests=False) - -add_bazel_tests(ubuntu_version='18.04', smoke_tests=['DebugPlain']) - -# ASan/UBSan are disabled for all these, the analysis on later versions is better anyway. -# Also, in some combinations they wouldn't work. -add_ubuntu_tests(ubuntu_version='16.04', compiler='gcc-5', asan=False, ubsan=False) -add_ubuntu_tests(ubuntu_version='16.04', compiler='clang-3.5', stl='libstdc++', asan=False, ubsan=False) -add_ubuntu_tests(ubuntu_version='16.04', compiler='clang-3.9', stl='libstdc++', asan=False, ubsan=False) - -# Asan/Ubsan are disabled because it generates lots of warnings like: -# warning: direct access in [...] to global weak symbol guard variable for [...] means the weak symbol cannot be -# overridden at runtime. This was likely caused by different translation units being compiled with different -# visibility settings. -# and the build eventually fails or times out. -add_osx_tests(compiler='gcc-6', xcode_version='11.4', asan=False, ubsan=False, clang_tidy=False) -add_osx_tests(compiler='gcc-9', xcode_version='11.4', asan=False, ubsan=False, clang_tidy=False, smoke_tests=['DebugPlain'], - # Using PCHs fails with this error: - # error: /Users/travis/build/google/fruit/build/tests/test_common-precompiled.h.gch: had text segment - # at different address - use_precompiled_headers_in_tests=False) -add_osx_tests(compiler='clang-6.0', xcode_version='11.4', stl='libc++', clang_tidy=False) -add_osx_tests(compiler='clang-8.0', xcode_version='11.4', stl='libc++', smoke_tests=['DebugPlain'], - clang_tidy=False, - # Disabled due to https://bugs.llvm.org/show_bug.cgi?id=41625. - use_precompiled_headers_in_tests=False) - -add_osx_tests(compiler='clang-default', xcode_version='9.4', stl='libc++', clang_tidy=False) -add_osx_tests(compiler='clang-default', xcode_version='11.3', stl='libc++', clang_tidy=False, - # Disabled due to https://bugs.llvm.org/show_bug.cgi?id=41625. - use_precompiled_headers_in_tests=False, - smoke_tests=['DebugPlain']) - -# ** Disabled combinations ** -# -# These fail with "'type_traits' file not found" (the <type_traits> header is missing). -# -# add_osx_tests('gcc-default', stl='libstdc++') -# add_osx_tests('clang-default', stl='libstdc++') -# add_osx_tests('clang-3.5', stl='libstdc++') -# add_osx_tests('clang-3.6', stl='libstdc++') -# -# -# The compiler complains that the 2-argument constructor of std::pair is ambiguous, even after -# adding explicit casts to the exact types of the expected overload. -# -# add_osx_tests('clang-default', stl='libc++') -# -# -# This triggers an assert error in the compiler, with the message: -# "expected to get called on an inlined function!" [...] function isMSExternInline, file Decl.cpp, line 2647. -# -# add_osx_tests('clang-3.5', stl='libc++', asan=False, ubsan=False) -# -# -# This fails with this error: -# /usr/include/c++/v1/string:1938:44: error: 'basic_string<_CharT, _Traits, _Allocator>' is missing -# exception specification 'noexcept(is_nothrow_copy_constructible<allocator_type>::value)' -# TODO: Try again every once in a while (to re-enable these once the bug in libc++ is fixed). -# -# add_ubuntu_tests(ubuntu_version='16.04', compiler='clang-3.8', stl='libc++', asan=False, ubsan=False) -# - - -yaml_file = { - 'sudo': 'required', - 'dist': 'xenial', - 'services': ['docker'], - 'language': 'cpp', - 'branches': { - 'only': ['master'], - }, - 'matrix': { - 'fast_finish': True, - 'include': build_matrix_smoke_test_rows + build_matrix_rows, - }, -} - - -class CustomDumper(yaml.SafeDumper): - def ignore_aliases(self, _data): - return True - - -print('#') -print('# This file was auto-generated from extras/scripts/travis_yml_generator.py, DO NOT EDIT') -print('#') -print(yaml.dump(yaml_file, default_flow_style=False, Dumper=CustomDumper)) |