From 5ee318e21ed4b7454e36c02291322c17c245cc19 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Sun, 9 Aug 2020 19:19:57 +0200 Subject: [PATCH 1/2] Simplify CMake invocation in CI --- .travis.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a44b5b..1a7b142 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: cpp -dist: trusty +dist: bionic os: - linux @@ -10,20 +10,11 @@ compiler: - gcc - clang -env: - - MSBUILD_PATH="c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin" - script: - mkdir bld - cd bld - cmake -D CIMGUI_TEST=1 .. - - | - if [ "$TRAVIS_OS_NAME" == "windows" ]; then - export PATH=$MSBUILD_PATH:$PATH - MSBuild.exe cimgui.sln - else - make - fi + - cmake --build . - | if [ "$TRAVIS_OS_NAME" == "windows" ]; then ./Debug/cimgui_test.exe From 8668cb268c94fa728ffba20c1ddc5232239a8f11 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Wed, 12 Aug 2020 22:04:55 +0200 Subject: [PATCH 2/2] Switch Ubuntu version to focal --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1a7b142..d24944f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: cpp -dist: bionic +dist: focal os: - linux