diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2018-12-09 09:39:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-09 09:39:01 (GMT) |
| commit | 6418587b6408e11bd400bea6729ade840fa4204c (patch) | |
| tree | d385885c6fd479a848533510909f02a135da5ee1 | |
| parent | 36cd8964fec836db0cc661ff0d1005c7f183525e (diff) | |
| parent | d8bc52b3bc9535e0f1b815cef4eb82c54752c810 (diff) | |
| download | Doxygen-6418587b6408e11bd400bea6729ade840fa4204c.zip Doxygen-6418587b6408e11bd400bea6729ade840fa4204c.tar.gz Doxygen-6418587b6408e11bd400bea6729ade840fa4204c.tar.bz2 | |
Merge pull request #6662 from Croydon/croydon/ci3-9-pr
CI: Updates to Qt and Winflexbison
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | appveyor.yml | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 829e54e..1130bec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,9 @@ before_script: export PATH=/Users/travis/Library/TeX/texbin:/Library/TeX/texbin:$PATH; conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan; - printf "[requires] \nlibxml2/2.9.8@bincrafters/stable \nQt/5.11.1@bincrafters/stable" >> conanfile.txt; + printf "[requires]\n + libxml2/2.9.8@bincrafters/stable\n + qt/5.11.3@bincrafters/stable" >> conanfile.txt; conan install . -g virtualrunenv; source activate_run.sh; fi; diff --git a/appveyor.yml b/appveyor.yml index bbafb40..61cb2e8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,8 +20,6 @@ init: - msbuild /version install: - - ps: Invoke-WebRequest https://github.com/lexxmark/winflexbison/releases/download/v2.5.15/win_flex_bison-2.5.15.zip -OutFile flex.zip - - 7z x flex.zip -oC:\deps\flex - ps: Invoke-WebRequest http://doxygen.nl/testing/miktex.zip -OutFile miktex.zip - 7z x miktex.zip -oC:\deps\miktex # Disabled MikTeX installed due to unreliable download @@ -34,9 +32,13 @@ install: # - C:\tmpmiktex\miktexsetup --verbose --local-package-repository=C:\temp\miktex --package-set=basic install - refreshenv - pip install conan - - conan install libxml2/2.9.8@bincrafters/stable -g virtualrunenv + - ps: | + "[requires] + libxml2/2.9.8@bincrafters/stable + winflexbison/2.5.16@bincrafters/stable" | Out-File -Encoding ASCII -FilePath conanfile.txt + - conan install . -g virtualrunenv --build missing - activate_run.bat - - set "PATH=%PATH%;C:\deps\ghostscript\bin;C:\deps\flex;C:\deps\miktex\miktex\bin" + - set "PATH=%PATH%;C:\deps\ghostscript\bin;C:\deps\miktex\miktex\bin" before_build: - if "%platform%"=="Win32" ( set "CMAKE_GENERATOR_NAME=Visual Studio %VSVERSION%" ) |