From 1bcabe295ff3980c1b3ec79566322b9ff2396c42 Mon Sep 17 00:00:00 2001 From: carsten-kuebler <32508295+carsten-kuebler@users.noreply.github.com> Date: Mon, 23 Apr 2018 13:59:08 +0200 Subject: [PATCH 01/22] Automation with TravisCI --- .travis.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.travis.yml b/.travis.yml index d113e625e..200776c7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,22 @@ install: PROTOBUF_URL="https://github.com/google/protobuf/releases/download/v3.2.0/protobuf-cpp-3.2.0.tar.gz" if [ ! -f ${DEPS_DIR}/protobuf/install/bin/protoc ] ; then mkdir -p protobuf ; travis_retry wget --no-check-certificate --quiet -O - ${PROTOBUF_URL} | tar --strip-components=1 -xz -C protobuf ; cd protobuf ; ./configure --prefix=${DEPS_DIR}/protobuf/install ; make ; make install ; fi export PATH=${DEPS_DIR}/protobuf/install/bin:${PATH} + + # Install proto2cpp for doxygen + - | + PROTO2CPP_URL="https://github.com/OpenSimulationInterface/proto2cpp.git" + if [ ! -f ${DEPS_DIR}/proto2cpp ] ; then mkdir -p proto2cpp ; git clone ${PROTO2CPP_URL} ${DEPS_DIR}/proto2cpp ; fi + + # export PATH=${DEPS_DIR}/proto2cpp:${PATH} + +addons: + apt: + packages: + - doxygen + - doxygen-doc + - doxygen-latex + - doxygen-gui + - graphviz # Change directory back to default build directory. before_script: @@ -50,3 +66,6 @@ script: - python setup.py sdist - cd build - cmake --build . --target install + - cmake -DFILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. + - cd .. + - doxygen From 75b54d88c20c87122f225f03a96ae8e1feaf2054 Mon Sep 17 00:00:00 2001 From: carsten-kuebler <32508295+carsten-kuebler@users.noreply.github.com> Date: Mon, 23 Apr 2018 14:06:48 +0200 Subject: [PATCH 02/22] Bugfix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 200776c7d..55081e3e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,5 +67,5 @@ script: - cd build - cmake --build . --target install - cmake -DFILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. - - cd .. - doxygen + - cd .. From 3f1e8e0cdf0850a25a364ccbcaeee8f9a46085ec Mon Sep 17 00:00:00 2001 From: carsten-kuebler <32508295+carsten-kuebler@users.noreply.github.com> Date: Mon, 23 Apr 2018 14:20:34 +0200 Subject: [PATCH 03/22] Python 3 for doxygen install python3 --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 55081e3e4..25e51454d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,7 @@ addons: - doxygen-latex - doxygen-gui - graphviz + - python3 # Change directory back to default build directory. before_script: @@ -69,3 +70,11 @@ script: - cmake -DFILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. - doxygen - cd .. + +deploy: + provider: pages + skip_cleanup: true + local_dir: "html" + github_token: "$GH_REPO_TOKEN" +# on: +#branch: master From cace0133eb8007bab93be86bea380e942ed3a562 Mon Sep 17 00:00:00 2001 From: carsten-kuebler <32508295+carsten-kuebler@users.noreply.github.com> Date: Mon, 23 Apr 2018 14:51:21 +0200 Subject: [PATCH 04/22] Temporary try new proto2cpp for travisCI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 25e51454d..fa00c9855 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ install: # Install proto2cpp for doxygen - | PROTO2CPP_URL="https://github.com/OpenSimulationInterface/proto2cpp.git" - if [ ! -f ${DEPS_DIR}/proto2cpp ] ; then mkdir -p proto2cpp ; git clone ${PROTO2CPP_URL} ${DEPS_DIR}/proto2cpp ; fi + if [ ! -f ${DEPS_DIR}/proto2cpp ] ; then mkdir -p proto2cpp ; git clone ${PROTO2CPP_URL} ${DEPS_DIR}/proto2cpp ; cd ${DEPS_DIR}/proto2cpp ; git checkout Bugfix/TravisCI_Python ; fi # export PATH=${DEPS_DIR}/proto2cpp:${PATH} From 24f46661c2c88dc2416b08800334e5ada7dcb36a Mon Sep 17 00:00:00 2001 From: carsten-kuebler <32508295+carsten-kuebler@users.noreply.github.com> Date: Mon, 23 Apr 2018 15:01:47 +0200 Subject: [PATCH 05/22] Restart TravisCI --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa00c9855..97a3950a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,6 @@ script: - cmake --build . --target install - cmake -DFILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. - doxygen - - cd .. deploy: provider: pages From a95bb957970e2e636dadb344d3bd02148cef6a93 Mon Sep 17 00:00:00 2001 From: carsten-kuebler <32508295+carsten-kuebler@users.noreply.github.com> Date: Mon, 23 Apr 2018 15:36:59 +0200 Subject: [PATCH 06/22] Try proto2cpp Support python2 for travis CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 97a3950a5..121e39d30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ install: # Install proto2cpp for doxygen - | PROTO2CPP_URL="https://github.com/OpenSimulationInterface/proto2cpp.git" - if [ ! -f ${DEPS_DIR}/proto2cpp ] ; then mkdir -p proto2cpp ; git clone ${PROTO2CPP_URL} ${DEPS_DIR}/proto2cpp ; cd ${DEPS_DIR}/proto2cpp ; git checkout Bugfix/TravisCI_Python ; fi + if [ ! -f ${DEPS_DIR}/proto2cpp ] ; then mkdir -p proto2cpp ; git clone ${PROTO2CPP_URL} ${DEPS_DIR}/proto2cpp ; cd ${DEPS_DIR}/proto2cpp ; git checkout Python2/3-compatibility ; fi # export PATH=${DEPS_DIR}/proto2cpp:${PATH} From cc1d997236cc51a8d6380518a6f0276298c63231 Mon Sep 17 00:00:00 2001 From: carsten-kuebler <32508295+carsten-kuebler@users.noreply.github.com> Date: Mon, 23 Apr 2018 15:56:35 +0200 Subject: [PATCH 07/22] Last test --- .travis.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 121e39d30..94a2fea14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,8 +38,6 @@ install: - | PROTO2CPP_URL="https://github.com/OpenSimulationInterface/proto2cpp.git" if [ ! -f ${DEPS_DIR}/proto2cpp ] ; then mkdir -p proto2cpp ; git clone ${PROTO2CPP_URL} ${DEPS_DIR}/proto2cpp ; cd ${DEPS_DIR}/proto2cpp ; git checkout Python2/3-compatibility ; fi - - # export PATH=${DEPS_DIR}/proto2cpp:${PATH} addons: apt: @@ -49,7 +47,6 @@ addons: - doxygen-latex - doxygen-gui - graphviz - - python3 # Change directory back to default build directory. before_script: @@ -59,7 +56,7 @@ before_script: script: - mkdir -p build - cd build - - cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install -D CMAKE_INSTALL_PREFIX:PATH=${TESTINST_DIR} .. + - cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install -D CMAKE_INSTALL_PREFIX:PATH=${TESTINST_DIR} -D FILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. - cmake --build . - cd .. - python test_cases.py @@ -67,7 +64,6 @@ script: - python setup.py sdist - cd build - cmake --build . --target install - - cmake -DFILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. - doxygen deploy: @@ -75,5 +71,5 @@ deploy: skip_cleanup: true local_dir: "html" github_token: "$GH_REPO_TOKEN" -# on: -#branch: master + on: +branch: master From 8e66e6d7d5f260a9ded090b8f1e4a869e26c5c4d Mon Sep 17 00:00:00 2001 From: carsten-kuebler <32508295+carsten-kuebler@users.noreply.github.com> Date: Mon, 23 Apr 2018 16:03:01 +0200 Subject: [PATCH 08/22] Final version for doxygen Personal access token for deployment necessary. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 94a2fea14..20ac450fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ install: # Install proto2cpp for doxygen - | PROTO2CPP_URL="https://github.com/OpenSimulationInterface/proto2cpp.git" - if [ ! -f ${DEPS_DIR}/proto2cpp ] ; then mkdir -p proto2cpp ; git clone ${PROTO2CPP_URL} ${DEPS_DIR}/proto2cpp ; cd ${DEPS_DIR}/proto2cpp ; git checkout Python2/3-compatibility ; fi + if [ ! -f ${DEPS_DIR}/proto2cpp ] ; then mkdir -p proto2cpp ; git clone ${PROTO2CPP_URL} ${DEPS_DIR}/proto2cpp ; fi addons: apt: From ba351ad990498cf9e673f86a1a3433d78850f5fb Mon Sep 17 00:00:00 2001 From: Carsten Kuebler Date: Tue, 24 Apr 2018 09:41:31 +0200 Subject: [PATCH 09/22] Test --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20ac450fa..b56caa52b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,5 +71,5 @@ deploy: skip_cleanup: true local_dir: "html" github_token: "$GH_REPO_TOKEN" - on: -branch: master +# on: +#branch: master From de08e9dd080f866f4f03c9c57633c865bde6a1d9 Mon Sep 17 00:00:00 2001 From: Carsten Kuebler Date: Tue, 24 Apr 2018 09:59:20 +0200 Subject: [PATCH 10/22] Test --- .travis.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b56caa52b..1b163bad9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ cache: directories: - ${HOME}/deps/cmake - ${HOME}/deps/protobuf + - ${HOME}/deps/proto2cpp # Handle dependencies in separate directory. before_install: @@ -38,7 +39,14 @@ install: - | PROTO2CPP_URL="https://github.com/OpenSimulationInterface/proto2cpp.git" if [ ! -f ${DEPS_DIR}/proto2cpp ] ; then mkdir -p proto2cpp ; git clone ${PROTO2CPP_URL} ${DEPS_DIR}/proto2cpp ; fi - + +# Environment variables +env: + global: + - GH_REPO_ORG=`echo $TRAVIS_REPO_SLUG | cut -d "/" -f 1` + - GH_REPO_NAME=`echo $TRAVIS_REPO_SLUG | cut -d "/" -f 2` + - GH_REPO_REF="github.com/$GH_REPO_ORG/$GH_REPO_NAME.git" + addons: apt: packages: @@ -69,7 +77,7 @@ script: deploy: provider: pages skip_cleanup: true - local_dir: "html" + local_dir: $TRAVIS_BUILD_DIR/docs/html github_token: "$GH_REPO_TOKEN" # on: -#branch: master +# branch: master From 4b216319e013719a8c5edb8ea153c9150a7f02ae Mon Sep 17 00:00:00 2001 From: Carsten Kuebler Date: Tue, 24 Apr 2018 10:06:52 +0200 Subject: [PATCH 11/22] Next try --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1b163bad9..644b9d33a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,6 +78,6 @@ deploy: provider: pages skip_cleanup: true local_dir: $TRAVIS_BUILD_DIR/docs/html - github_token: "$GH_REPO_TOKEN" + github_token: $GH_REPO_TOKEN # on: # branch: master From 34495a9ae24c1c761725b8d38edb7d255f96bc90 Mon Sep 17 00:00:00 2001 From: Carsten Kuebler Date: Tue, 24 Apr 2018 10:19:20 +0200 Subject: [PATCH 12/22] Next Try --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 644b9d33a..c352934cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ cache: directories: - ${HOME}/deps/cmake - ${HOME}/deps/protobuf - - ${HOME}/deps/proto2cpp +# - ${HOME}/deps/proto2cpp # Handle dependencies in separate directory. before_install: From 4a6f5c7ce000f548626d398a3e3900e91dca1a13 Mon Sep 17 00:00:00 2001 From: Carsten Kuebler Date: Tue, 24 Apr 2018 10:40:35 +0200 Subject: [PATCH 13/22] Next try --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c352934cf..2d003d8dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ before_install: - mkdir -p "${DEPS_DIR}" - cd "${DEPS_DIR}" +# Install necessary install: # Install a recent version of CMake - | @@ -77,7 +78,8 @@ script: deploy: provider: pages skip_cleanup: true - local_dir: $TRAVIS_BUILD_DIR/docs/html - github_token: $GH_REPO_TOKEN + local_dir: docs/html + keep-history: true + github_token: ${GH_REPO_TOKEN} # on: # branch: master From bac8191b2280e5c120b1b7670759e87753e56dbd Mon Sep 17 00:00:00 2001 From: Carsten Kuebler Date: Tue, 24 Apr 2018 11:02:52 +0200 Subject: [PATCH 14/22] next try --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2d003d8dc..4dfce3f85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,5 +81,5 @@ deploy: local_dir: docs/html keep-history: true github_token: ${GH_REPO_TOKEN} -# on: -# branch: master + on: + branch: Documenation/github_pages From 8dca24fa7f9a01312987cf17561b7aada22b69ed Mon Sep 17 00:00:00 2001 From: Carsten Kuebler Date: Tue, 24 Apr 2018 11:09:43 +0200 Subject: [PATCH 15/22] next try --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4dfce3f85..adc2be47c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,19 +66,19 @@ script: - mkdir -p build - cd build - cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install -D CMAKE_INSTALL_PREFIX:PATH=${TESTINST_DIR} -D FILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. - - cmake --build . + #- cmake --build . - cd .. - python test_cases.py - python setup.py build - python setup.py sdist - cd build - - cmake --build . --target install + #- cmake --build . --target install - doxygen deploy: provider: pages skip_cleanup: true - local_dir: docs/html + local_dir: doc/html keep-history: true github_token: ${GH_REPO_TOKEN} on: From 4bcd49b12a276ddbc9c66d2596cb6d1bb8092f9a Mon Sep 17 00:00:00 2001 From: Carsten Kuebler Date: Tue, 24 Apr 2018 11:24:35 +0200 Subject: [PATCH 16/22] next try --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index adc2be47c..1002f9f8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,6 +63,7 @@ before_script: # Run the build script. script: + - cat (echo) "VERSION_PATCH = MasterBranch" >> VERSION - mkdir -p build - cd build - cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install -D CMAKE_INSTALL_PREFIX:PATH=${TESTINST_DIR} -D FILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. From f3af12a361dcad2239a1d6400f5a8f4b1a6d0c8d Mon Sep 17 00:00:00 2001 From: Carsten Kuebler Date: Tue, 24 Apr 2018 11:30:45 +0200 Subject: [PATCH 17/22] next try --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1002f9f8d..ebee5fd76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,7 @@ before_script: # Run the build script. script: - - cat (echo) "VERSION_PATCH = MasterBranch" >> VERSION + - echo "VERSION_PATCH = MasterBranch" >> VERSION - mkdir -p build - cd build - cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install -D CMAKE_INSTALL_PREFIX:PATH=${TESTINST_DIR} -D FILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. From 8fcd2ca0715a8db20b24516e8233f4c688f9446f Mon Sep 17 00:00:00 2001 From: Carsten Kuebler Date: Tue, 24 Apr 2018 11:37:32 +0200 Subject: [PATCH 18/22] Next try --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ebee5fd76..658b695af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,7 @@ before_script: # Run the build script. script: - - echo "VERSION_PATCH = MasterBranch" >> VERSION + - echo "VERSION_PATCH = \"MasterBranch\"" >> VERSION - mkdir -p build - cd build - cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install -D CMAKE_INSTALL_PREFIX:PATH=${TESTINST_DIR} -D FILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. From 61d23001a956c9dda693752f8015d554b806e156 Mon Sep 17 00:00:00 2001 From: Carsten Kuebler Date: Tue, 24 Apr 2018 11:47:02 +0200 Subject: [PATCH 19/22] Change execution only for master branch --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 658b695af..1f65357c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,17 +63,17 @@ before_script: # Run the build script. script: - - echo "VERSION_PATCH = \"MasterBranch\"" >> VERSION + - echo "VERSION_PATCH = \"GitHub_MasterBranch\"" >> VERSION - mkdir -p build - cd build - cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install -D CMAKE_INSTALL_PREFIX:PATH=${TESTINST_DIR} -D FILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. - #- cmake --build . + - cmake --build . - cd .. - python test_cases.py - python setup.py build - python setup.py sdist - cd build - #- cmake --build . --target install + - cmake --build . --target install - doxygen deploy: @@ -83,4 +83,4 @@ deploy: keep-history: true github_token: ${GH_REPO_TOKEN} on: - branch: Documenation/github_pages + branch: master From 2a7ec847a916000b95a50761e1c2c0fd3643940a Mon Sep 17 00:00:00 2001 From: Carsten Kuebler Date: Tue, 24 Apr 2018 11:59:51 +0200 Subject: [PATCH 20/22] Try again --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f65357c7..1e9ca99d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,10 +63,9 @@ before_script: # Run the build script. script: - - echo "VERSION_PATCH = \"GitHub_MasterBranch\"" >> VERSION - mkdir -p build - cd build - - cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install -D CMAKE_INSTALL_PREFIX:PATH=${TESTINST_DIR} -D FILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. + - cmake -D CMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install -D CMAKE_INSTALL_PREFIX:PATH=${TESTINST_DIR} .. - cmake --build . - cd .. - python test_cases.py @@ -74,7 +73,12 @@ script: - python setup.py sdist - cd build - cmake --build . --target install + - cd .. + - echo "VERSION_PATCH = \"GitHub_MasterBranch\"" >> VERSION + - cd build + - cmake -D FILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. - doxygen + - cd .. deploy: provider: pages From 38d78bb186cc862140ea433132553c9cea91252b Mon Sep 17 00:00:00 2001 From: Carsten Kuebler Date: Tue, 24 Apr 2018 12:05:16 +0200 Subject: [PATCH 21/22] Last Changes :-) --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e9ca99d2..a2cd58971 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_install: - mkdir -p "${DEPS_DIR}" - cd "${DEPS_DIR}" -# Install necessary +# Install necessary packages. install: # Install a recent version of CMake - | @@ -41,13 +41,14 @@ install: PROTO2CPP_URL="https://github.com/OpenSimulationInterface/proto2cpp.git" if [ ! -f ${DEPS_DIR}/proto2cpp ] ; then mkdir -p proto2cpp ; git clone ${PROTO2CPP_URL} ${DEPS_DIR}/proto2cpp ; fi -# Environment variables +# Environment variables. env: global: - GH_REPO_ORG=`echo $TRAVIS_REPO_SLUG | cut -d "/" -f 1` - GH_REPO_NAME=`echo $TRAVIS_REPO_SLUG | cut -d "/" -f 2` - GH_REPO_REF="github.com/$GH_REPO_ORG/$GH_REPO_NAME.git" +# Addons necessary for documentation. addons: apt: packages: @@ -61,7 +62,7 @@ addons: before_script: - cd "${TRAVIS_BUILD_DIR}" -# Run the build script. +# Run the build script and generate documentation. script: - mkdir -p build - cd build @@ -74,12 +75,14 @@ script: - cd build - cmake --build . --target install - cd .. + - echo "" >> VERSION - echo "VERSION_PATCH = \"GitHub_MasterBranch\"" >> VERSION - cd build - cmake -D FILTER_PROTO2CPP_PY_PATH=${DEPS_DIR}/proto2cpp .. - doxygen - cd .. +# Deploy the documentation on github (only for master branch). deploy: provider: pages skip_cleanup: true From 2cdef13dc9e4e5a2e7816c32f95935be9e5e0d6d Mon Sep 17 00:00:00 2001 From: Carlo van Driesten Date: Wed, 25 Apr 2018 18:39:34 +0200 Subject: [PATCH 22/22] Changed version patch because of documentation changes --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index acc700dd0..69cb18ed1 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ VERSION_MAJOR = 3 VERSION_MINOR = 0 -VERSION_PATCH = 0 +VERSION_PATCH = 1