Adjust CI config as matrix.
parent
813217bf00
commit
c05df29b3b
18
.travis.yml
18
.travis.yml
|
@ -1,10 +1,15 @@
|
||||||
language: c
|
language: c
|
||||||
os:
|
|
||||||
- linux
|
matrix:
|
||||||
- osx
|
include:
|
||||||
sudo: required
|
|
||||||
dist: trusty
|
- os: linux
|
||||||
osx_image: xcode8.2
|
sudo: required
|
||||||
|
dist: trusty
|
||||||
|
|
||||||
|
- os: osx
|
||||||
|
osx_image: xcode8.2
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.travis/install-debian.sh; fi
|
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.travis/install-debian.sh; fi
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./.travis/install-macos.sh; fi
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./.travis/install-macos.sh; fi
|
||||||
|
@ -12,6 +17,7 @@ script:
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.travis/build-debian.sh; fi
|
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./.travis/build-debian.sh; fi
|
||||||
# the awk command is a workaround for https://github.com/travis-ci/travis-ci/issues/4704.
|
# the awk command is a workaround for https://github.com/travis-ci/travis-ci/issues/4704.
|
||||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./.travis/build-macos.sh | awk '/.{0,32}/ {print $0}'; fi
|
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./.travis/build-macos.sh | awk '/.{0,32}/ {print $0}'; fi
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
- provider: releases
|
- provider: releases
|
||||||
api_key:
|
api_key:
|
||||||
|
|
28
appveyor.yml
28
appveyor.yml
|
@ -1,17 +1,20 @@
|
||||||
version: '{build}'
|
version: '{build}'
|
||||||
clone_depth: 1
|
clone_depth: 1
|
||||||
before_build:
|
for:
|
||||||
- git submodule update --init
|
- image: Visual Studio 2013
|
||||||
- set tag=x%APPVEYOR_REPO_TAG_NAME%
|
before_build:
|
||||||
- if %tag:~,2% == xv (set BUILD_TYPE=RelWithDebInfo) else (set BUILD_TYPE=Debug)
|
- git submodule update --init
|
||||||
- mkdir build
|
- set tag=x%APPVEYOR_REPO_TAG_NAME%
|
||||||
- cmake -G"Visual Studio 12" -Tv120 -Bbuild -H.
|
- if %tag:~,2% == xv (set BUILD_TYPE=RelWithDebInfo) else (set BUILD_TYPE=Debug)
|
||||||
build_script:
|
- mkdir build
|
||||||
- msbuild "build\src\solvespace.vcxproj" /verbosity:minimal /property:Configuration=%BUILD_TYPE% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
|
- cmake -G"Visual Studio 12" -Tv120 -Bbuild -H.
|
||||||
- msbuild "build\src\solvespace-cli.vcxproj" /verbosity:minimal /property:Configuration=%BUILD_TYPE% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
|
build_script:
|
||||||
- msbuild "build\test\solvespace-testsuite.vcxproj" /verbosity:minimal /property:Configuration=%BUILD_TYPE% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
|
- msbuild "build\src\solvespace.vcxproj" /verbosity:minimal /property:Configuration=%BUILD_TYPE% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
|
||||||
test_script:
|
- msbuild "build\src\solvespace-cli.vcxproj" /verbosity:minimal /property:Configuration=%BUILD_TYPE% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
|
||||||
- build\bin\%BUILD_TYPE%\solvespace-testsuite.exe
|
- msbuild "build\test\solvespace-testsuite.vcxproj" /verbosity:minimal /property:Configuration=%BUILD_TYPE% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
|
||||||
|
test_script:
|
||||||
|
- build\bin\%BUILD_TYPE%\solvespace-testsuite.exe
|
||||||
|
|
||||||
artifacts:
|
artifacts:
|
||||||
- path: build\bin\%BUILD_TYPE%\solvespace.exe
|
- path: build\bin\%BUILD_TYPE%\solvespace.exe
|
||||||
name: solvespace.exe
|
name: solvespace.exe
|
||||||
|
@ -19,6 +22,7 @@ artifacts:
|
||||||
name: solvespace-cli.exe
|
name: solvespace-cli.exe
|
||||||
- path: build\bin\%BUILD_TYPE%\solvespace.pdb
|
- path: build\bin\%BUILD_TYPE%\solvespace.pdb
|
||||||
name: solvespace.pdb
|
name: solvespace.pdb
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
- provider: GitHub
|
- provider: GitHub
|
||||||
auth_token:
|
auth_token:
|
||||||
|
|
Loading…
Reference in New Issue