From 122667b2b218a57085056d41d28af392f6555776 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 15 Jan 2020 10:36:30 +0100 Subject: [PATCH 1/8] Update .travis.yml Set depth to 1 because we do not need the history. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8fe39d59c..79ccf5b1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,9 @@ env: - secure: "lZ7pHQvl5dpZWzBQAaIMf0wqrvtcZ4wiZKeIZjf83TEsflW8+z0uTpIuN30ZV6Glth/Sq1OhLnTP5+N57fZU/1ebA5twHdvP4bS5CIUUg71/CXQZNl36xeaqvxsG/xRrdpKOsPdjAOsQ9KPTQulsX43XDLS7CasMiLvYOpqKcPc=" - PV=r8e PLATF=linux-x86_64 NDK_HOME=${TRAVIS_BUILD_DIR}/android-ndk-${PV} PATH=${PATH}:${NDK_HOME} +git: + depth: 1 + matrix: include: - os: linux From babf9eac0f53e3e6a7533d028f594aad6715c204 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 15 Jan 2020 10:39:48 +0100 Subject: [PATCH 2/8] Update appveyor.yml Enable git clone --depth 1 --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index fa0a125f0..9aeac7832 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,8 @@ # clone directory clone_folder: c:\projects\assimp +clone_depth: 1 + # branches to build branches: # whitelist From 23e4dd8ae5d06a9a3681ccc0b93396b56bbddee9 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 15 Jan 2020 14:11:40 +0100 Subject: [PATCH 3/8] Update appveyor.yml Use cmake for build. --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 9aeac7832..4e1df941a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -54,9 +54,11 @@ cache: - bin\.mtime_cache before_build: + - echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS% - ruby scripts\AppVeyor\mtime_cache -g scripts\AppVeyor\cacheglobs.txt -c bin\.mtime_cache\cache.json build: + - cmake --build . --use-stderr --target Release -- -j%NUMBER_OF_PROCESSORS% parallel: true project: Assimp.sln From 9867bdd9841188396c848233d98f12998f7b5929 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 15 Jan 2020 15:08:35 +0100 Subject: [PATCH 4/8] Update appveyor.yml Fix the build script. --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4e1df941a..a5f2fd111 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -59,8 +59,6 @@ before_build: build: - cmake --build . --use-stderr --target Release -- -j%NUMBER_OF_PROCESSORS% - parallel: true - project: Assimp.sln after_build: - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( From f7ca69c07efbd0a021bb9870d78ad40d9be96b57 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 15 Jan 2020 15:53:24 +0100 Subject: [PATCH 5/8] Update appveyor.yml Next try --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a5f2fd111..aadb90da3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -58,7 +58,7 @@ before_build: - ruby scripts\AppVeyor\mtime_cache -g scripts\AppVeyor\cacheglobs.txt -c bin\.mtime_cache\cache.json build: - - cmake --build . --use-stderr --target Release -- -j%NUMBER_OF_PROCESSORS% + - cmake --build . --target Release -j%NUMBER_OF_PROCESSORS% after_build: - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( From ce087fe6e20100bb3b98b061b6d7ad424ee61e9d Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 15 Jan 2020 16:03:39 +0100 Subject: [PATCH 6/8] Update appveyor.yml Fix the build --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index aadb90da3..857ddd849 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -58,7 +58,8 @@ before_build: - ruby scripts\AppVeyor\mtime_cache -g scripts\AppVeyor\cacheglobs.txt -c bin\.mtime_cache\cache.json build: - - cmake --build . --target Release -j%NUMBER_OF_PROCESSORS% + parallel: true + project: Assimp.sln after_build: - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( From 25a11ac10168c74a53495ff31691079f555dc757 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 17 Jan 2020 13:33:50 +0100 Subject: [PATCH 7/8] Update appveyor.yml Try to enable parallel build. --- appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 857ddd849..61ec49f8f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,9 +57,8 @@ before_build: - echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS% - ruby scripts\AppVeyor\mtime_cache -g scripts\AppVeyor\cacheglobs.txt -c bin\.mtime_cache\cache.json -build: - parallel: true - project: Assimp.sln +build_script: + cmake --build . -- /maxcpucount:2 after_build: - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" ( From d2e4d47908a5d1535493cc3106377adab393ab3c Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 17 Jan 2020 19:32:59 +0100 Subject: [PATCH 8/8] Update appveyor.yml fix build folder --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 61ec49f8f..299f42df6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -58,7 +58,7 @@ before_build: - ruby scripts\AppVeyor\mtime_cache -g scripts\AppVeyor\cacheglobs.txt -c bin\.mtime_cache\cache.json build_script: - cmake --build . -- /maxcpucount:2 + cmake --build . --config Release -- /maxcpucount:2 after_build: - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2017" (