From 0fbb972e9cd99f0c4a1df39cd6fc8d7e95e66754 Mon Sep 17 00:00:00 2001 From: "James P. Howard, II" Date: Sat, 3 Oct 2020 18:17:19 -0400 Subject: [PATCH] Rewrite travis build process from scratch --- .ci-files/.travis.yml | 55 ------------------ .ci-files/conan_server/server.conf | 66 ---------------------- .ci-files/install_cmake.sh | 27 --------- .ci-files/install_conan.sh | 25 -------- .ci-files/run.sh | 14 ----- .ci-files/run_conan_server.sh | 9 --- .travis.yml | 19 +++++-- cmake/{Config.cmake.in => config.cmake.in} | 0 cmake/{Warnings.cmake => warnings.cmake} | 0 9 files changed, 13 insertions(+), 202 deletions(-) delete mode 100644 .ci-files/.travis.yml delete mode 100644 .ci-files/conan_server/server.conf delete mode 100644 .ci-files/install_cmake.sh delete mode 100644 .ci-files/install_conan.sh delete mode 100644 .ci-files/run.sh delete mode 100644 .ci-files/run_conan_server.sh rename cmake/{Config.cmake.in => config.cmake.in} (100%) rename cmake/{Warnings.cmake => warnings.cmake} (100%) diff --git a/.ci-files/.travis.yml b/.ci-files/.travis.yml deleted file mode 100644 index 7f9029f..0000000 --- a/.ci-files/.travis.yml +++ /dev/null @@ -1,55 +0,0 @@ -linux: &linux - os: linux - dist: xenial - language: python - python: "3.7" - services: - - docker -osx: &osx - os: osx - language: generic -matrix: - include: - - <<: *linux - env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49 - - <<: *linux - env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5 - - <<: *linux - env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6 - - <<: *linux - env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7 - - <<: *linux - env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8 - - <<: *linux - env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39 - - <<: *linux - env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=conanio/clang40 - - <<: *linux - env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=conanio/clang50 - - <<: *linux - env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60 - - <<: *linux - env: CONAN_CLANG_VERSIONS=7.0 CONAN_DOCKER_IMAGE=conanio/clang7 - - <<: *osx - osx_image: xcode7.3 - env: CONAN_APPLE_CLANG_VERSIONS=7.3 - - <<: *osx - osx_image: xcode8.3 - env: CONAN_APPLE_CLANG_VERSIONS=8.1 - - <<: *osx - osx_image: xcode9 - env: CONAN_APPLE_CLANG_VERSIONS=9.0 - - <<: *osx - osx_image: xcode9.4 - env: CONAN_APPLE_CLANG_VERSIONS=9.1 - - <<: *osx - osx_image: xcode10.1 - env: CONAN_APPLE_CLANG_VERSIONS=10.0 - -install: - - chmod +x .ci/install.sh - - ./.ci/install.sh - -script: - - chmod +x .ci/run.sh - - ./.ci/run.sh diff --git a/.ci-files/conan_server/server.conf b/.ci-files/conan_server/server.conf deleted file mode 100644 index 30116a8..0000000 --- a/.ci-files/conan_server/server.conf +++ /dev/null @@ -1,66 +0,0 @@ -[server] -# WARNING! Change default variable of jwt_secret. You should change it periodically -# It only affects to current authentication tokens, you can change safetely anytime -# When it changes user are just forced to log in again -jwt_secret: dSktZiPDNsiBpFQKWIpUgdHp -jwt_expire_minutes: 120 - -ssl_enabled: False -port: 9300 -# Public port where files will be served. If empty will be used "port" -public_port: -host_name: localhost - -# Authorize timeout are seconds the client has to upload/download files until authorization expires -authorize_timeout: 1800 - -# Just for disk storage adapter -# updown_secret is the key used to generate the upload/download authorization token -disk_storage_path: ~/.conan_server/data -disk_authorize_timeout: 1800 -updown_secret: EHKKsMYJTeyLITZlwrRVJJIL - - -# Check docs.conan.io to implement a different authenticator plugin for conan_server -# if custom_authenticator is not specified, [users] section will be used to authenticate -# the users. -# -# custom_authenticator: my_authenticator - -# name/version@user/channel: user1, user2, user3 -# -# The rules are applied in order. -# If a rule matches your package, then the server wont look further. -# Place your more restrictive rules first. -# -# Example: All versions of opencv package from lasote user in testing channel is only -# writeable by default_user and default_user2. Rest of packages are not writtable by anything -# except the author. -# -# opencv/2.3.4@lasote/testing: default_user, default_user2 -# -[write_permissions] -*/*@*/*: * - -# name/version@user/channel: user1, user2, user3 -# The rules are applied in order. If a rule applies to a conan, system wont look further. -# -# Example: -# All versions of opencv package from lasote user in testing channel are only -# readable by default_user and default_user2. -# All versions of internal package from any user/channel are only readable by -# authenticated users. -# Rest of packages are world readable. -# -# opencv/*@lasote/testing: default_user default_user2 -# internal/*@*/*: ? -# */*@*/*: * -# -# By default all users can read all blocks -# -[read_permissions] -*/*@*/*: * - -[users] -#default_user: defaultpass -demo: demo diff --git a/.ci-files/install_cmake.sh b/.ci-files/install_cmake.sh deleted file mode 100644 index 464879d..0000000 --- a/.ci-files/install_cmake.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -set -e -set -x - -if [[ "$(uname -s)" == 'Darwin' ]]; then - echo "Darwin!" - brew install cmake || true - brew upgrade cmake -else - - - VERSION=3.13.4 - - which cmake - wget -q https://github.com/Kitware/CMake/releases/download/v${VERSION}/cmake-${VERSION}-Linux-x86_64.tar.gz -O cmake.tar.gz - tar -xzf cmake.tar.gz - - # Remove the original files and copy the new ones over. - #sudo rm -rf /usr/local/cmake-3.12.4/* - sudo cp -r cmake-${VERSION}*/* $(dirname $(dirname $(which cmake))) - which cmake - - -fi - - cmake --version diff --git a/.ci-files/install_conan.sh b/.ci-files/install_conan.sh deleted file mode 100644 index bfcff03..0000000 --- a/.ci-files/install_conan.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e -set -x - -if [[ "$(uname -s)" == 'Darwin' ]]; then - brew update || brew update - brew outdated pyenv || brew upgrade pyenv - brew install pyenv-virtualenv - brew install cmake || true - - if which pyenv > /dev/null; then - eval "$(pyenv init -)" - fi - - pyenv install 2.7.10 - pyenv virtualenv 2.7.10 conan - pyenv rehash - pyenv activate conan -fi - -pip install conan --upgrade -pip install conan_package_tools bincrafters_package_tools -conan user -conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan diff --git a/.ci-files/run.sh b/.ci-files/run.sh deleted file mode 100644 index 3aa3383..0000000 --- a/.ci-files/run.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -e -set -x - -if [[ "$(uname -s)" == 'Darwin' ]]; then - if which pyenv > /dev/null; then - eval "$(pyenv init -)" - fi - pyenv activate conan -fi - -conan create . local/testing -#python build.py diff --git a/.ci-files/run_conan_server.sh b/.ci-files/run_conan_server.sh deleted file mode 100644 index c4ec246..0000000 --- a/.ci-files/run_conan_server.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -e -set -x - -mkdir -p $HOME/.conan_server -cp .ci-files/conan_server/* $HOME/.conan_server -conan_server & -sleep 3 diff --git a/.travis.yml b/.travis.yml index 95638c8..85211c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,15 +50,22 @@ matrix: addons: apt: + sources: + - george-edison55-precise-backports packages: + - cmake-data + - cmake - doxygen install: - pip3 install -r docs/requirements.txt - - chmod +x .ci-files/install_conan.sh .ci-files/install_cmake.sh - - ./.ci-files/install_conan.sh - - ./.ci-files/install_cmake.sh + - pip3 install conan -script: - - chmod +x .ci-files/run.sh - - ./.ci-files/run.sh +script: | + mkdir build + cd build + conan install .. + cmake .. + cmake --build . + ctest -C Debug + cmake --build . --target install diff --git a/cmake/Config.cmake.in b/cmake/config.cmake.in similarity index 100% rename from cmake/Config.cmake.in rename to cmake/config.cmake.in diff --git a/cmake/Warnings.cmake b/cmake/warnings.cmake similarity index 100% rename from cmake/Warnings.cmake rename to cmake/warnings.cmake