diff options
| author | Marco Trevisan <mail@3v1n0.net> | 2017-02-13 22:35:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 22:35:35 +0300 |
| commit | 172fb709913fc09338208013ce36d9d778712119 (patch) | |
| tree | 609bf49e0c94c9bfdbf8de91d6500a3bf409a31c /scripts | |
| parent | 17c3bb5c93aa9ed16c4f3cdd34f144a698bf5559 (diff) | |
snap: use snapcraft 2.26 features (#1115)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis-build.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/scripts/travis-build.sh b/scripts/travis-build.sh index c61337e18..a7b76837b 100755 --- a/scripts/travis-build.sh +++ b/scripts/travis-build.sh @@ -72,12 +72,6 @@ elif [ "$BUILD_TYPE" == "snap" ]; then if [ "$TRAVIS_BUILD_STEP" == "before_install" ]; then if [ -n "$ARCH" ]; then DOCKER_IMAGE="$ARCH/$DOCKER_IMAGE"; fi docker run --name $DOCKER_BUILDER_NAME -v $PWD:$PWD -w $PWD -td $DOCKER_IMAGE - - # Sometimes the arch isn't properly recognized by snapcraft - # Fixed in https://github.com/snapcore/snapcraft/pull/1060 - if [ -n "$ARCH" ]; then - echo -e "architectures:\n - $ARCH" >> snap/snapcraft.yaml.in - fi elif [ "$TRAVIS_BUILD_STEP" == "install" ]; then docker_exec apt-get update -q docker_exec apt-get install cmake git-core snapcraft -y |