Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,14 @@ jobs:
deploy:
provider: bintray
file: .travis.deploy.json
skip_cleanup: true
user: $BINTRAY_USER
key: $BINTRAY_APIKEY
on:
all_branches: true

- stage: Deploy
if: tag IS present
skip_cleanup: true
before_install:
- cp scripts/tests/.env.mysql.travis .env
- docker-compose --version
Expand All @@ -166,7 +166,6 @@ jobs:

- stage: Deploy
if: tag IS present
skip_cleanup: true
before_install:
- scripts/vagrant/install-vagrant.sh

Expand All @@ -182,6 +181,7 @@ jobs:
deploy:
provider: bintray
file: .travis.deploy.json
skip_cleanup: true
user: $BINTRAY_USER
key: $BINTRAY_APIKEY
on:
Expand Down
Binary file modified .travis.yml.sig
Binary file not shown.
5 changes: 3 additions & 2 deletions scripts/vagrant/install-vagrant.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/sh
#!/bin/bash
set -euo pipefail

# set version of vagrant to use :
vagrantversion=2.0.2
vagrantversion=2.0.3

mkdir -p $HOME/vagrant
pushd $HOME/vagrant > /dev/null
Expand Down