Skip to content

Commit

Permalink
Merge branch 'release-0.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
fpelliccioni committed May 20, 2020
2 parents 6f22821 + bd225f9 commit 336f335
Show file tree
Hide file tree
Showing 31 changed files with 730 additions and 812 deletions.
24 changes: 11 additions & 13 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ install:
- set PATH=%PYTHON%;%PYTHON%/Scripts/;%PATH%;
- python.exe --version
- python.exe -m pip install --upgrade pip > NUL
- pip.exe install conan_package_tools==0.30.4 > NUL
- pip.exe install conan_package_tools==0.32.4 > NUL
# - pip install kthbuild==0.0.14 > NUL
- pip.exe install kthbuild --upgrade > NUL
- conan user # It creates the conan data directory
Expand Down Expand Up @@ -90,7 +90,6 @@ test_script:
conan remove "*" -f
conan remote remove kth
conan remote remove kthbuild_kth_temp_
conan remote remove kthbuild_bitprim_temp_
$ErrorActionPreference = 'Continue'
Expand All @@ -103,7 +102,6 @@ for:
only:
- /(dev|feature).*/ # Just development branches
environment:

APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
CONAN_VISUAL_VERSIONS: 16
CONAN_VISUAL_RUNTIMES: MT
Expand All @@ -124,16 +122,16 @@ for:
CONAN_VISUAL_RUNTIMES: MD
KTH_RUN_TESTS: true

- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
CONAN_VISUAL_VERSIONS: 15
CONAN_VISUAL_RUNTIMES: MT
KTH_RUN_TESTS: true
VS150COMNTOOLS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\Tools\\"
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
CONAN_VISUAL_VERSIONS: 15
CONAN_VISUAL_RUNTIMES: MD
KTH_RUN_TESTS: true
VS150COMNTOOLS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\Tools\\"
# - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
# CONAN_VISUAL_VERSIONS: 15
# CONAN_VISUAL_RUNTIMES: MT
# KTH_RUN_TESTS: true
# VS150COMNTOOLS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\Tools\\"
# - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
# CONAN_VISUAL_VERSIONS: 15
# CONAN_VISUAL_RUNTIMES: MD
# KTH_RUN_TESTS: true
# VS150COMNTOOLS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\Tools\\"

# - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
# CONAN_VISUAL_VERSIONS: 14
Expand Down
Loading

0 comments on commit 336f335

Please sign in to comment.