Skip to content

Commit

Permalink
CI changes
Browse files Browse the repository at this point in the history
  • Loading branch information
fpelliccioni committed Apr 22, 2019
1 parent cdae781 commit 9c6795a
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
23 changes: 16 additions & 7 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,24 @@ branches:
build: false

environment:
PYTHON: "C:\\Python27"
PYTHON_VERSION: "2.7.8"
PYTHON: "C:\\Python37"
PYTHON_VERSION: "3.7.3"
PYTHON_ARCH: "32"
CONAN_STABLE_BRANCH_PATTERN: "master$" #"release/*"

install:
- set PATH=%PATH%;%PYTHON%/Scripts/
- pip.exe install conan --upgrade > NUL
# - pip.exe install conan==1.0.0b5 #Fixed Beta version...
- pip.exe install conan_package_tools > NUL

- set PATH=%PYTHON%;%PYTHON%/Scripts/;%PATH%;
- python.exe --version
- python.exe -m pip install --upgrade pip
- pip.exe install conan==1.14.3 > NUL
- pip.exe install conan_package_tools==0.25.1 > NUL
- pip.exe install cpuid --upgrade > NUL

# - pip.exe install conan --upgrade > NUL
# - pip.exe install conan==1.0.0b5 > NUL
# - pip.exe install conan_package_tools --upgrade > NUL

- conan user # It creates the conan data directory

test_script:
Expand All @@ -64,6 +71,7 @@ test_script:
- python build.py


for:
-
branches:
Expand Down Expand Up @@ -93,7 +101,8 @@ for:
VS150COMNTOOLS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\Tools\\"
# - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
# CONAN_VISUAL_VERSIONS: 14
# - MINGW_CONFIGURATIONS: "8@x86_64@seh@posix"

- MINGW_CONFIGURATIONS: "8@x86_64@seh@posix"
- MINGW_CONFIGURATIONS: "7@x86_64@seh@posix"
# - MINGW_CONFIGURATIONS: "6@x86_64@seh@posix"
# - MINGW_CONFIGURATIONS: "5@x86_64@seh@posix"
Expand Down
2 changes: 1 addition & 1 deletion ci_utils

0 comments on commit 9c6795a

Please sign in to comment.