appveyor: upgrate to python 3.7 and conan 1.17.2

- Also upgrade travis builder to the same conan version
- Different versions of libcurl/libopenssl for appveyor/travis
v0.27.3
Luis Diaz Mas 6 years ago committed by Luis Díaz Más
parent fd0cab155b
commit ef4315fe28

@ -1,4 +1,6 @@
environment: environment:
PYTHON: "C:\\Python37"
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
CMAKE_GENERATOR: Visual Studio 10 2010 CMAKE_GENERATOR: Visual Studio 10 2010
@ -44,24 +46,18 @@ environment:
shallow_clone: true shallow_clone: true
install: install:
- set PATH=%PATH%;%PYTHON%/Scripts/
- echo %APPVEYOR_BUILD_FOLDER% - echo %APPVEYOR_BUILD_FOLDER%
- mkdir C:\projects\deps - mkdir C:\projects\deps
- cd C:\projects\deps - cd C:\projects\deps
- appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip -FileName ninja.zip - appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip -FileName ninja.zip
- 7z x ninja.zip -oC:\projects\deps\ninja > nul - 7z x ninja.zip -oC:\projects\deps\ninja > nul
- set PATH=C:\projects\deps\ninja;%PATH% - set PATH=C:\projects\deps\ninja;%PATH%
- ninja --version - ninja --version
- pip.exe install conan==1.17.2
- cd %APPVEYOR_BUILD_FOLDER%
before_build: before_build:
- cmd: cd %APPVEYOR_BUILD_FOLDER%
- cmd: if not exist envs mkdir envs
- cmd: cd envs
- cmd: python -m virtualenv conan
- cmd: conan/Scripts/activate
- cmd: python -m pip install conan==1.11.2 # TODO: Update to latest version (needs python 3)
- cmd: cd ..
- cmd: conan --version
- cmd: conan remote add conan-bincrafters https://api.bintray.com/conan/bincrafters/public-conan
- cmd: conan remote list - cmd: conan remote list
- cmd: conan config set storage.path=c:\Users\appveyor\conanCache - cmd: conan config set storage.path=c:\Users\appveyor\conanCache
- cmd: conan profile new --detect default - cmd: conan profile new --detect default
@ -74,6 +70,8 @@ build_script:
- cmd: md build - cmd: md build
- cmd: cd build - cmd: cd build
- cmd: call "%VCVARS%" x86_amd64 - cmd: call "%VCVARS%" x86_amd64
- cmd: conan --version
- cmd: conan remote list
- cmd: conan install .. -o webready=True --build missing - cmd: conan install .. -o webready=True --build missing
- cmd: echo %CMAKE_GENERATOR% - cmd: echo %CMAKE_GENERATOR%
- cmd: cmake -G "%CMAKE_GENERATOR%" -DEXIV2_TEAM_WARNINGS_AS_ERRORS=%WARNINGS_AS_ERRORS% -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=%UNIT_TESTS% -DCMAKE_INSTALL_PREFIX=install .. - cmd: cmake -G "%CMAKE_GENERATOR%" -DEXIV2_TEAM_WARNINGS_AS_ERRORS=%WARNINGS_AS_ERRORS% -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=%UNIT_TESTS% -DCMAKE_INSTALL_PREFIX=install ..
@ -86,5 +84,4 @@ build_script:
- cmd: if %INTEGRATION_TESTS% == 1 c:\Python36\python.exe runner.py -v - cmd: if %INTEGRATION_TESTS% == 1 c:\Python36\python.exe runner.py -v
cache: cache:
- envs # Conan installation
- c:\Users\appveyor\conanCache # Conan cache - c:\Users\appveyor\conanCache # Conan cache

@ -22,7 +22,7 @@ else
fi fi
python --version python --version
pip install conan==1.17.0 pip install conan==1.17.2
pip install codecov pip install codecov
conan --version conan --version
conan config set storage.path=~/conanData conan config set storage.path=~/conanData

@ -34,7 +34,14 @@ class Exiv2Conan(ConanFile):
self.requires('gtest/1.8.1@bincrafters/stable') self.requires('gtest/1.8.1@bincrafters/stable')
if self.options.webready and not os_info.is_macos: if self.options.webready and not os_info.is_macos:
self.requires('libcurl/7.64.1@bincrafters/stable') # Note: This difference in versions is just due to a combination of corner cases in the
# recipes and the OS & compiler versions used in Travis and AppVeyor. In normal cases we
# could use any of the versions.Also note that the issue was not with libcurl but with
# libopenssl (a transitive dependency)
if os_info.is_windows:
self.requires('libcurl/7.61.1@bincrafters/stable')
else:
self.requires('libcurl/7.64.1@bincrafters/stable')
if self.options.xmp: if self.options.xmp:
self.requires('XmpSdk/2016.7@piponazo/stable') # from conan-piponazo self.requires('XmpSdk/2016.7@piponazo/stable') # from conan-piponazo

Loading…
Cancel
Save