zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Travis: deploy tagged & master commits to GitHub 

Our implicit deploy conditions were previously only met by untagged commits
on master. As the stage conditions filter everything except branch = master
and tagged commits, we can just use all_branches: true to also deploy tagged
builds.

Also clean up the snap deploy sections.
pull/803/head
Maximilian Federle 2020-11-18 15:27:35 +01:00
parent 1b2d47cd86
commit 898fb6f4f5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -39,6 +39,8 @@ jobs:
name: ${TRAVIS_TAG:-edge} name: ${TRAVIS_TAG:-edge}
release_notes: $TRAVIS_COMMIT_MESSAGE release_notes: $TRAVIS_COMMIT_MESSAGE
file: build/bin/SolveSpace.dmg file: build/bin/SolveSpace.dmg
on:
all_branches: true
- stage: test - stage: test
name: "Ubuntu" name: "Ubuntu"
os: linux os: linux
@ -65,6 +67,8 @@ jobs:
name: ${TRAVIS_TAG:-edge} name: ${TRAVIS_TAG:-edge}
release_notes: $TRAVIS_COMMIT_MESSAGE release_notes: $TRAVIS_COMMIT_MESSAGE
file: build/bin/RelWithDebInfo/solvespace.exe file: build/bin/RelWithDebInfo/solvespace.exe
on:
all_branches: true
- stage: deploy - stage: deploy
name: "Windows with OpenMP" name: "Windows with OpenMP"
os: windows os: windows
@ -80,6 +84,8 @@ jobs:
name: ${TRAVIS_TAG:-edge} name: ${TRAVIS_TAG:-edge}
release_notes: $TRAVIS_COMMIT_MESSAGE release_notes: $TRAVIS_COMMIT_MESSAGE
file: build/bin/RelWithDebInfo/solvespace-openmp.exe file: build/bin/RelWithDebInfo/solvespace-openmp.exe
on:
all_branches: true
- &deploy-snap - &deploy-snap
stage: deploy stage: deploy
name: Snap amd64 name: Snap amd64
@ -95,14 +101,10 @@ jobs:
- provider: script - provider: script
script: sudo .travis/deploy-snap.sh edge script: sudo .travis/deploy-snap.sh edge
skip_cleanup: true skip_cleanup: true
on:
branch: master
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 skip_cleanup: true
on: on:
branch: master
tags: true tags: true
- <<: *deploy-snap - <<: *deploy-snap
name: Snap arm64 name: Snap arm64