diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2018-02-27 01:15:46 +0300 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2018-02-27 01:24:28 +0300 |
| commit | 34cd921a69dd157e211be2774c6d54d67eda1584 (patch) | |
| tree | 9b7fbdba1fdbcd3acb683772b0e46184b154518f /scripts | |
| parent | 86bb4177c65ade520947f3a57fef4178d1f81048 (diff) | |
snap: use new features, reduce cmake usage and travis deploy
We can now move to use build.snapcraft.io for
deployment.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis-build.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/scripts/travis-build.sh b/scripts/travis-build.sh index 6203eea89..2c66240a8 100755 --- a/scripts/travis-build.sh +++ b/scripts/travis-build.sh @@ -1,6 +1,6 @@ #!/bin/bash # Remmina - The GTK+ Remote Desktop Client -# Copyright (C) 2014-2017 Marco Trevisan +# Copyright (C) 2017-2018 Marco Trevisan # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -77,6 +77,9 @@ elif [ "$BUILD_TYPE" == "snap" ]; then elif [ "$TRAVIS_BUILD_STEP" == "install" ]; then docker_exec apt-get update -q docker_exec apt-get install -y cmake git-core snapcraft + if [ "$SNAP_TRANSFER_SH_UPLOAD" == "true" ]; then + docker_exec apt-get install -y curl + fi elif [ "$TRAVIS_BUILD_STEP" == "script" ]; then git clean -f cmake_buld_type="Release" @@ -106,15 +109,14 @@ elif [ "$BUILD_TYPE" == "snap" ]; then fi set -x - if [ "$TRAVIS_PULL_REQUEST" != "false" ] && - [ "$SNAP_TRANSFER_SH_UPLOAD_ON_PULL_REQUEST" == "true" ]; then - docker_exec apt-get install -y curl + elif [ "$TRAVIS_BUILD_STEP" == "deploy-unstable" ]; then + if [ "$SNAP_TRANSFER_SH_UPLOAD" == "true" ]; then docker_exec make snap-push-transfer.sh -C $BUILD_FOLDER fi - elif [ "$TRAVIS_BUILD_STEP" == "deploy-unstable" ]; then - docker_exec make snap-push-$SNAP_UNSTABLE_CHANNEL -C $BUILD_FOLDER elif [ "$TRAVIS_BUILD_STEP" == "deploy-release" ]; then - docker_exec make snap-push-$SNAP_RELEASE_CHANNEL -C $BUILD_FOLDER + if [ "$SNAP_TRANSFER_SH_UPLOAD" == "true" ]; then + docker_exec make snap-push-transfer.sh -C $BUILD_FOLDER + fi fi else echo 'No $BUILD_TYPE defined' |