Travis: update travis and macos build configs

- Fixing warnings in .travis.yml
- Enable building on all cores for macOS build
- Quote variables
pull/755/head
Koen Schmeets 2020-10-20 14:14:49 +02:00 committed by phkahler
parent 3af8127e8f
commit 9d2641a5de
3 changed files with 21 additions and 19 deletions

View File

@ -1,3 +1,5 @@
os: linux
dist: xenial
language: c language: c
git: git:
submodules: false submodules: false
@ -7,23 +9,23 @@ jobs:
name: Snap arm64 name: Snap arm64
include: include:
- stage: test - stage: test
name: macOS name: macOS test
os: osx os: osx
osx_image: xcode12.2 osx_image: xcode12.2
install: "./.travis/install-macos.sh" install: ".travis/install-macos.sh"
script: "./.travis/build-macos.sh" script: ".travis/build-macos.sh"
- stage: deploy - stage: deploy
if: tag IS present if: tag IS present
name: macOS name: macOS deploy
os: osx os: osx
osx_image: xcode12.2 osx_image: xcode12.2
install: "./.travis/install-macos.sh" install: ".travis/install-macos.sh"
script: "./.travis/build-macos.sh && ./.travis/sign-macos.sh" script: ".travis/build-macos.sh && .travis/sign-macos.sh"
deploy: deploy:
provider: releases provider: releases
api_key: token:
secure: dDlkIawHcODlW9B/20/cQCtzeoocvs0hKuNngRKXKqzXLWTRq33oq/B7+39tAixWbmv6exTpijiKrRNFiSCW5Z4iwHLwaRD4XJznxw63e/Hus/dxg2Tvqx7XFpkCz8mT1Z+gZQE5YxAngeZPpI/sZbZtF1UO3yH5eLeeokZ15p26ZskQUPoYuzrTgTzYL3XfpG3F+20rNBawH1ycsCTVD/08/n31d2m3CrKAsbW7er92ek6w4fzKr7NW8WeXjrPJETVpw5fQg1Od3pRGW8dPQaJcvKQEogMp8Mm0ETYd0qigg89/giBz7QwOgmAWQ4dH+DfZH4Ojl//127QztBolMvyDMQBykWrtJoGcij05sT6K2IJr2FHeUBO12MAEdjiVvhQj3DtTzjPiZAHHDBSLWxLKWWhlhHE4pq7g1MQhqXkaAHI2BLNzwLmaowbMT0bECf9yfz6xx18h6XPQFX44oOktraobVALFlyHqeKa8zdcUt22LF6uAL1m5dxL0tny3eXCIPE4UH/RZgua/cHV9G3cUvKQa/QnFSLRhvWVSbGB+7YsHouBJcsUOOW1gmd5442XuC7mpppccRldh+GSxUk6TBJRAx7TeQ0ybDUaoco9MUqp2twv3KreR2+8Q12PDaAhfQVNEGdF3wTm1sShImjCN4VN3eSLlBEbve1QRQXM= secure: dDlkIawHcODlW9B/20/cQCtzeoocvs0hKuNngRKXKqzXLWTRq33oq/B7+39tAixWbmv6exTpijiKrRNFiSCW5Z4iwHLwaRD4XJznxw63e/Hus/dxg2Tvqx7XFpkCz8mT1Z+gZQE5YxAngeZPpI/sZbZtF1UO3yH5eLeeokZ15p26ZskQUPoYuzrTgTzYL3XfpG3F+20rNBawH1ycsCTVD/08/n31d2m3CrKAsbW7er92ek6w4fzKr7NW8WeXjrPJETVpw5fQg1Od3pRGW8dPQaJcvKQEogMp8Mm0ETYd0qigg89/giBz7QwOgmAWQ4dH+DfZH4Ojl//127QztBolMvyDMQBykWrtJoGcij05sT6K2IJr2FHeUBO12MAEdjiVvhQj3DtTzjPiZAHHDBSLWxLKWWhlhHE4pq7g1MQhqXkaAHI2BLNzwLmaowbMT0bECf9yfz6xx18h6XPQFX44oOktraobVALFlyHqeKa8zdcUt22LF6uAL1m5dxL0tny3eXCIPE4UH/RZgua/cHV9G3cUvKQa/QnFSLRhvWVSbGB+7YsHouBJcsUOOW1gmd5442XuC7mpppccRldh+GSxUk6TBJRAx7TeQ0ybDUaoco9MUqp2twv3KreR2+8Q12PDaAhfQVNEGdF3wTm1sShImjCN4VN3eSLlBEbve1QRQXM=
skip_cleanup: true cleanup: false
file: build/bin/SolveSpace.dmg file: build/bin/SolveSpace.dmg
on: on:
repo: solvespace/solvespace repo: solvespace/solvespace
@ -32,13 +34,13 @@ jobs:
name: "Debian" name: "Debian"
os: linux os: linux
dist: bionic dist: bionic
install: ./.travis/install-debian.sh install: .travis/install-debian.sh
script: ./.travis/build-debian.sh script: .travis/build-debian.sh
- stage: test - stage: test
name: "Windows Visual Studio 2017" name: "Windows Visual Studio 2017"
os: windows os: windows
install: ./.travis/install-windows.sh install: .travis/install-windows.sh
script: ./.travis/build-windows.sh script: .travis/build-windows.sh
- &deploy-snap - &deploy-snap
stage: deploy stage: deploy
name: Snap amd64 name: Snap amd64
@ -49,17 +51,17 @@ jobs:
snaps: snaps:
- name: snapcraft - name: snapcraft
confinement: classic confinement: classic
script: ./.travis/build-snap.sh script: .travis/build-snap.sh
deploy: deploy:
- provider: script - provider: script
script: sudo ./.travis/deploy-snap.sh edge script: sudo .travis/deploy-snap.sh edge
skip_cleanup: true cleanup: false
on: on:
branch: master branch: master
tags: false tags: false
- provider: script - provider: script
script: sudo ./.travis/deploy-snap.sh edge,beta script: sudo .travis/deploy-snap.sh edge,beta
skip_cleanup: true cleanup: false
on: on:
branch: master branch: master
tags: true tags: true

View File

@ -21,5 +21,5 @@ cmake \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE .. \ -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. \
-DENABLE_OPENMP=ON -DENABLE_OPENMP=ON
cmake --build . --config $BUILD_TYPE cmake --build . --config $BUILD_TYPE -- -j$(nproc)
make -j$(nproc) test_solvespace make -j$(nproc) test_solvespace

View File

@ -16,7 +16,7 @@ if [ "$CI" = "true" ]; then
security unlock-keychain -p secret build.keychain security unlock-keychain -p secret build.keychain
# import the key # import the key
security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PASSWORD -T /usr/bin/codesign security import certificate.p12 -k build.keychain -P "${MACOS_CERTIFICATE_PASSWORD}" -T /usr/bin/codesign
security set-key-partition-list -S apple-tool:,apple: -s -k secret build.keychain security set-key-partition-list -S apple-tool:,apple: -s -k secret build.keychain