From 898fb6f4f5624fda29707713d6b7e21cdd152c31 Mon Sep 17 00:00:00 2001 From: Maximilian Federle Date: Wed, 18 Nov 2020 15:27:35 +0100 Subject: [PATCH] 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. --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9f6489..0681bf2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,8 @@ jobs: name: ${TRAVIS_TAG:-edge} release_notes: $TRAVIS_COMMIT_MESSAGE file: build/bin/SolveSpace.dmg + on: + all_branches: true - stage: test name: "Ubuntu" os: linux @@ -65,6 +67,8 @@ jobs: name: ${TRAVIS_TAG:-edge} release_notes: $TRAVIS_COMMIT_MESSAGE file: build/bin/RelWithDebInfo/solvespace.exe + on: + all_branches: true - stage: deploy name: "Windows with OpenMP" os: windows @@ -80,6 +84,8 @@ jobs: name: ${TRAVIS_TAG:-edge} release_notes: $TRAVIS_COMMIT_MESSAGE file: build/bin/RelWithDebInfo/solvespace-openmp.exe + on: + all_branches: true - &deploy-snap stage: deploy name: Snap amd64 @@ -95,14 +101,10 @@ jobs: - provider: script script: sudo .travis/deploy-snap.sh edge skip_cleanup: true - on: - branch: master - tags: false - provider: script script: sudo .travis/deploy-snap.sh edge,beta skip_cleanup: true on: - branch: master tags: true - <<: *deploy-snap name: Snap arm64