From 5d73b343389646c4481f6d373a82ea83276ca27e Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 18 Aug 2020 15:22:34 +0200 Subject: [PATCH] Update .travis.yml and win.sh --- .travis.yml | 13 +++++++++++++ travis/win.sh | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0f0325..96ef35f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,19 @@ os: - windows osx_image: xcode10.1 +arch: + - amd64 + - arm64 + +jobs: + include: + - os: linux + arch: amd64 + - os: linux + arch: arm64 + - os: windows + arch: amd64 + deploy: provider: pages skip-cleanup: true diff --git a/travis/win.sh b/travis/win.sh index ed3e193..a97c343 100644 --- a/travis/win.sh +++ b/travis/win.sh @@ -44,7 +44,7 @@ cd jnibuild export JAVA_HOME="c:\\java11" # Build -cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$TRAVIS_BUILD_DIR\vcpkg\scripts\buildsystems\vcpkg.cmake ${TD_SRC_DIR} +cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$TRAVIS_BUILD_DIR\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake ${TD_SRC_DIR} cmake --build . --target install -- -j4 @@ -52,7 +52,7 @@ cd ../../../../../ #mvn install -X cd src/main/jni/jtdlib/build -cmake -DCMAKE_BUILD_TYPE=Release -DTd_DIR=${TD_BIN_DIR}/lib/cmake/Td -DJAVA_SRC_DIR=${JAVA_SRC_DIR} -DCMAKE_INSTALL_PREFIX:PATH=.. -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$TRAVIS_BUILD_DIR\vcpkg\scripts\buildsystems\vcpkg.cmake .. +cmake -DCMAKE_BUILD_TYPE=Release -DTd_DIR=${TD_BIN_DIR}/lib/cmake/Td -DJAVA_SRC_DIR=${JAVA_SRC_DIR} -DCMAKE_INSTALL_PREFIX:PATH=.. -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$TRAVIS_BUILD_DIR\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake .. cmake --build . --target install -- -j4 cd ..