diff options
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rwxr-xr-x | scripts/travis_build (renamed from scripts/update_docs) | 17 | ||||
| -rwxr-xr-x | scripts/update_version | 38 |
3 files changed, 20 insertions, 53 deletions
diff --git a/.travis.yml b/.travis.yml index 7a43043e..6b3f92f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,6 @@ matrix: - g++-5 - libegl1-mesa-dev - libgles2-mesa-dev - - libglm-dev - xorg-dev - libglu1-mesa-dev - doxygen @@ -38,7 +37,6 @@ matrix: - g++-6 - libegl1-mesa-dev - libgles2-mesa-dev - - libglm-dev - xorg-dev - libglu1-mesa-dev - doxygen @@ -55,7 +53,6 @@ matrix: - g++-7 - libegl1-mesa-dev - libgles2-mesa-dev - - libglm-dev - xorg-dev - libglu1-mesa-dev - doxygen @@ -73,7 +70,6 @@ matrix: - clang-4.0 - libegl1-mesa-dev - libgles2-mesa-dev - - libglm-dev - xorg-dev - libglu1-mesa-dev - doxygen @@ -92,7 +88,6 @@ matrix: - clang-5.0 - libegl1-mesa-dev - libgles2-mesa-dev - - libglm-dev - xorg-dev - libglu1-mesa-dev - doxygen @@ -106,13 +101,6 @@ matrix: notifications: email: false script: - - "$CC --version" - - "$CXX --version" - - "cd $TRAVIS_BUILD_DIR" - - "mkdir -p build" - - "cd build" - - "cmake -DUNIT_TESTS=ON .." - - "make -j9" - - ctest - - "cd .. && ./scripts/update_docs" - + - "./scripts/travis_build" + + diff --git a/scripts/update_docs b/scripts/travis_build index be1eaf1d..3cca70a2 100755 --- a/scripts/update_docs +++ b/scripts/travis_build @@ -1,5 +1,22 @@ #!/usr/bin/env bash +# check compiler versions +$CC --version +$CXX --version + +# go to correct directory +cd $TRAVIS_BUILD_DIR + +# start building +mkdir -p build +cd build +cmake .. +make +cd tests +ctest +cd ../.. + +# update docs if we are on the master branch if [[ "$TRAVIS_BRANCH" == "master" ]]; then if [ -d "$TRAVIS_BUILD_DIR/build/doc_doxygen/html" ]; then git clone -b gh-pages "https://$GH_TOKEN@github.com/ymherklotz/YAGE.git" YAGE_gh-pages diff --git a/scripts/update_version b/scripts/update_version deleted file mode 100755 index 9c618fa6..00000000 --- a/scripts/update_version +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python -# ----------------------------------------------------------------------------- -# @file: add_version_headers -# -# Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -# MIT License, see LICENSE file for more details. -# ----------------------------------------------------------------------------- - - -import os -import re -import sys - - -def main(argv): - cwd = os.path.join(os.getcwd(), argv[2]) - cmake = os.path.join(cwd, "CMakeLists.txt") - doxyfile = os.path.join(cwd, "docs", "Doxyfile") - - with open(cmake, "r+") as f_: - src = f_.read() - f_.seek(0) - src = re.sub(r"(project\(\w+\s+VERSION\s+)[0-9.]+", r"\g<1>{0}.0".format(argv[1]), src, re.MULTILINE) - f_.write(src) - f_.truncate() - - with open(doxyfile, "r+") as f_: - src = f_.read() - f_.seek(0) - src = re.sub(r"(PROJECT_NUMBER\s+=\s+v)[0-9.]+", r"\g<1>{0}".format(argv[1]), src, re.MULTILINE) - f_.write(src) - f_.truncate() - - return 0 - - -if __name__ == "__main__": - sys.exit(main(sys.argv)) |