diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-01-08 18:44:36 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-08 18:44:36 (GMT) |
| commit | d2a39613ba6ff8780eeeb5550598190efa178ebc (patch) | |
| tree | d7d7bb832c5845c456edeb16f62c9aa4dc546261 | |
| parent | eed9b0d5ebaaeda40149eef6fee4b329872b7d3c (diff) | |
| parent | a012da2ca206bd3937ef74a63f9fb2e85ec14b88 (diff) | |
| download | Doxygen-d2a39613ba6ff8780eeeb5550598190efa178ebc.zip Doxygen-d2a39613ba6ff8780eeeb5550598190efa178ebc.tar.gz Doxygen-d2a39613ba6ff8780eeeb5550598190efa178ebc.tar.bz2 | |
Merge pull request #6745 from Croydon/croydon/ci4
CI: Faster run time and envionment updates
| -rw-r--r-- | .travis.yml | 70 | ||||
| -rw-r--r-- | appveyor.yml | 1 |
2 files changed, 53 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 1130bec..4d42ce2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,9 @@ language: cpp -os: - - linux-ppc64le - - linux +os: linux dist: xenial compiler: - gcc - clang -sudo: required addons: apt: @@ -18,24 +15,64 @@ addons: - texlive-latex-extra - texlive-font-utils - ghostscript - - libxml2-utils - - cmake - - cmake-data + +linux-ppc64le: &linux-ppc64le + os: linux-ppc64le + env: + - OS_NAME="linux-ppc64le" + addons: + apt: + update: true + packages: + - texlive + - texlive-generic-recommended + - texlive-extra-utils + - texlive-latex-extra + - texlive-font-utils + - ghostscript + - libxml2-utils + - cmake + - cmake-data jobs: include: + - <<: *linux-ppc64le + compiler: gcc + - <<: *linux-ppc64le + compiler: clang - os: osx compiler: clang + addons: + homebrew: + packages: + - ghostscript + casks: + - mactex-no-gui before_script: + - | + if [ "${TRAVIS_OS_NAME}" == "linux" ] && [ ! "${OS_NAME}" == "linux-ppc64le" ]; then + printf "[requires] + libxml2/2.9.8@bincrafters/stable + libiconv/1.15@bincrafters/stable + [build_requires] + cmake_installer/3.10.0@conan/stable" >> conanfile.txt; + fi; + if [ "${TRAVIS_OS_NAME}" == "osx" ]; then + printf "[requires] + libxml2/2.9.8@bincrafters/stable + libiconv/1.15@bincrafters/stable + qt/5.12.0@bincrafters/stable + [options] + qt:shared=True" >> conanfile.txt; + fi; + - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then + pip install --quiet --user conan; + fi; - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then - sudo mkdir -p /usr/local/man; - sudo chown -R "${USER}:admin" /usr/local/man; + pip install --upgrade pip; pip install --quiet conan; - export HOMEBREW_NO_AUTO_UPDATE=1; - brew install ghostscript; - travis_wait brew cask install mactex-no-gui; curl -O -L http://mirrors.ctan.org/support/epstopdf.zip; unzip epstopdf.zip; mkdir -p /Users/travis/Library/TeX/texbin/; @@ -43,18 +80,17 @@ before_script: chmod a+x /Users/travis/Library/TeX/texbin/epstopdf; rm -rf epstopdf*; export PATH=/Users/travis/Library/TeX/texbin:/Library/TeX/texbin:$PATH; - + fi; + - if [ ! "${OS_NAME}" == "linux-ppc64le" ]; then conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan; - printf "[requires]\n - libxml2/2.9.8@bincrafters/stable\n - qt/5.11.3@bincrafters/stable" >> conanfile.txt; - conan install . -g virtualrunenv; + conan install . -g virtualrunenv --build missing --update; source activate_run.sh; fi; script: - mkdir build - cd build + - cmake --version; - cmake -G "Unix Makefiles" -Dbuild_doc=ON -Dbuild_wizard=ON .. - make - make tests diff --git a/appveyor.yml b/appveyor.yml index 61cb2e8..0cea036 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -55,5 +55,4 @@ test_script: - msbuild "testing\tests.vcxproj" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" # Disabled building document due to unreliable MikTeX installation # - cmake -G "%CMAKE_GENERATOR_NAME%" -D build_doc=ON .. - - cmake -G "%CMAKE_GENERATOR_NAME%" .. # - msbuild "doc\docs.vcxproj" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" |