Skip to content

Commit

Permalink
Merge pull request #25 from uilianries/feature/update-ci
Browse files Browse the repository at this point in the history
Drop Conan from CI
  • Loading branch information
d-frey committed Mar 10, 2020
2 parents b7f66c8 + 61cbbc3 commit a7cdda3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 60 deletions.
22 changes: 1 addition & 21 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ configuration:
environment:
PGUSER: postgres
PGPASSWORD: Password12!
matrix:
- GENERATOR: Visual Studio 15 2017 Win64
- CONAN_VISUAL_VERSIONS: 15

init: []

Expand All @@ -25,28 +22,11 @@ before_build:
- if defined BINDIR (set "PATH=%BINDIR%;%PATH:C:\Program Files\Git\usr\bin;=%")
- md build
- cd build
- cmake -Wno-dev --config "%CONFIGURATION%" -G "%GENERATOR%" ..
- cmake -Wno-dev --config "%CONFIGURATION%" -G "Visual Studio 15 2017 Win64" ..

build_script:
- cmake --build . --config "%CONFIGURATION%"

test_script:
- PATH=C:\Program Files\PostgreSQL\9.6\bin\;%PATH%
- ctest -C "%CONFIGURATION%" --output-on-failure

for:
-
matrix:
only:
- CONAN_VISUAL_VERSIONS: 15
environment:
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
PYTHON: "C:\\Python37"
CONAN_BUILD_TYPES: "%CONFIGURATION%"
build: false
install:
- set PATH=%PATH%;%PYTHON%/Scripts/
- pip.exe install --upgrade conan conan_package_tools
test_script:
- python .conan/build.py

39 changes: 0 additions & 39 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,6 @@ branches:
only:
- master

linux-conan: &linux-conan
language: python
python: "3.7"
services:
- docker
install:
- .conan/travis/install.sh
script:
- .conan/travis/run.sh

osx-conan: &osx-conan
os: osx
install:
- .conan/travis/install.sh
script:
- .conan/travis/run.sh

matrix:
include:
- compiler: gcc
Expand Down Expand Up @@ -101,28 +84,6 @@ matrix:
- $CXX --version
- make -j3 compile

- <<: *linux-conan
env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7

- <<: *linux-conan
env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8

- <<: *linux-conan
env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=conanio/clang50

- <<: *linux-conan
env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60

- <<: *linux-conan
env: CONAN_CLANG_VERSIONS=7.0 CONAN_DOCKER_IMAGE=conanio/clang7

# - <<: *linux-conan
# env: CONAN_CLANG_VERSIONS=8.0 CONAN_DOCKER_IMAGE=conanio/clang8

- <<: *osx-conan
osx_image: xcode10
env: CONAN_APPLE_CLANG_VERSIONS=10.0

- compiler: clang
addons:
apt:
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@ The library was successfully tested with

Older versions of Visual Studio might work, 15.4 is known *not* to work. Let us know if you try any version between 15.4 and 15.9 and whether it works or not.

## Package Managers

You can download and install taopq using the [Conan](https://github.com/conan-io/conan) package manager:

conan install taocpp-taopq/20200215@

The taopq package in conan is kept up to date by Conan team members and community contributors. If the version is out-of-date, please [create an issue or pull request](https://github.com/conan-io/conan-center-index) on the Conan Center Index repository.

## Contact

taoPQ is part of [The Art of C++].
Expand Down

0 comments on commit a7cdda3

Please sign in to comment.