Skip to content

Commit 24daa26

Browse files
committed
Merge branch 'release/v0.3.0'
2 parents 9cbd4eb + c0daf3d commit 24daa26

File tree

107 files changed

+3867
-3233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+3867
-3233
lines changed

.ci-files/.travis.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

.ci-files/conan_server/server.conf

Lines changed: 0 additions & 66 deletions
This file was deleted.

.ci-files/install_cmake.sh

Lines changed: 0 additions & 27 deletions
This file was deleted.

.ci-files/install_conan.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

.ci-files/run.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

.ci-files/run_conan_server.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Build
2+
3+
on:
4+
push:
5+
branches: [ main, develop ]
6+
pull_request:
7+
branches: [ main, develop ]
8+
9+
env:
10+
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
11+
BUILD_TYPE: Debug
12+
13+
jobs:
14+
build:
15+
# The CMake configure and build commands are platform agnostic and should work equally
16+
# well on Windows or Mac. You can convert this to a matrix build if you need
17+
# cross-platform coverage.
18+
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
- uses: actions/checkout@v2
23+
24+
- name: Install Conan
25+
id: conan
26+
uses: turtlebrowser/get-conan@main
27+
28+
- name: Conan The Frogarian
29+
run: conan frogarian
30+
31+
- name: Conan Profile Setup
32+
run: |
33+
conan config init
34+
conan profile update settings.compiler.libcxx=libstdc++11 default
35+
36+
- name: Conan Install Dependencies
37+
run: conan install -if build .
38+
39+
- name: Configure CMake
40+
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
41+
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
42+
run: cmake -B build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
43+
44+
- name: Build
45+
# Build your program with the given configuration
46+
run: cmake --build build --config ${{env.BUILD_TYPE}}
47+
48+
- name: Test
49+
# Execute tests defined by the CMake configuration.
50+
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
51+
run: cmake --build build --target test --config ${{env.BUILD_TYPE}}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ build/*
3838

3939
# Qtcreator files
4040
*.user
41+
42+
# VSCode files
43+
.vscode

.readthedocs.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# .readthedocs.yaml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4+
5+
# Required
6+
version: 2
7+
8+
# Build documentation in the docs/ directory with Sphinx
9+
sphinx:
10+
configuration: docs/conf.py
11+
12+
# Optionally build your docs in additional formats such as PDF
13+
formats:
14+
- pdf
15+
16+
# Optionally set the version of Python and requirements required to build your docs
17+
python:
18+
version: "3.7"
19+
install:
20+
- requirements: docs/requirements.txt

.travis.yml

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ linux: &linux
55
python: "3.7"
66
services:
77
- docker
8+
89
osx: &osx
910
os: osx
1011
language: generic
12+
1113
matrix:
1214
include:
1315
- <<: *linux
@@ -46,11 +48,42 @@ matrix:
4648
osx_image: xcode10.1
4749
env: CONAN_APPLE_CLANG_VERSIONS=10.0
4850

51+
addons:
52+
apt:
53+
- doxygen
54+
4955
install:
50-
- chmod +x .ci-files/install_conan.sh .ci-files/install_cmake.sh
51-
- ./.ci-files/install_conan.sh
52-
- ./.ci-files/install_cmake.sh
56+
# Get some stuff we need for Sphinx and Conan
57+
- pip3 install -r docs/requirements.txt
58+
- pip3 install conan
59+
# first we create a directory for the CMake binaries
60+
- DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
61+
- mkdir ${DEPS_DIR} && cd ${DEPS_DIR}
62+
# we use wget to fetch the cmake binaries
63+
- travis_retry wget --no-check-certificate https://github.com/Kitware/CMake/releases/download/v3.18.3/cmake-3.18.3-Linux-x86_64.tar.gz
64+
- travis_retry wget --no-check-certificate https://github.com/Kitware/CMake/releases/download/v3.18.3/cmake-3.18.3-SHA-256.txt
65+
- travis_retry wget --no-check-certificate https://github.com/Kitware/CMake/releases/download/v3.18.3/cmake-3.18.3-SHA-256.txt.asc
66+
# this is optional, but useful:
67+
# do a quick md5 check to ensure that the archive we downloaded did not get compromised, leave off GPG verification for now
68+
- sha256sum --ignore-missing -c cmake-3.18.3-SHA-256.txt
69+
# extract the binaries; the output here is quite lengthy,
70+
# so we swallow it to not clutter up the travis console
71+
- tar -xvf cmake-3.18.3-Linux-x86_64.tar.gz > /dev/null
72+
- mv cmake-3.18.3-Linux-x86_64 cmake-install
73+
# add both the top-level directory and the bin directory from the archive
74+
# to the system PATH. By adding it to the front of the path we hide the
75+
# preinstalled CMake with our own.
76+
- PATH=${DEPS_DIR}/cmake-install:${DEPS_DIR}/cmake-install/bin:$PATH
77+
# don't forget to switch back to the main build directory once you are done
78+
- cd ${TRAVIS_BUILD_DIR}
79+
80+
before_script:
81+
- mkdir build
82+
- cd build
83+
- conan install ..
84+
- cmake ..
5385

54-
script:
55-
- chmod +x .ci-files/run.sh
56-
- ./.ci-files/run.sh
86+
script: |
87+
- cmake --build .
88+
- ctest -C Debug
89+
- cmake --build . --target install

0 commit comments

Comments
 (0)