Skip to content
This repository has been archived by the owner on Nov 12, 2023. It is now read-only.

[REPO SYNC] Merge pull request #4 from cloudalchemy/travis_fix #30

Merged
merged 1 commit into from
Jan 13, 2020
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
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
os: linux
dist: xenial
sudo: required
language: python
python:
- 3.7
Expand All @@ -11,15 +11,13 @@ env:
- ANSIBLE=2.7
- ANSIBLE=2.8
- ANSIBLE=2.9
matrix:
fast_finish: true
install:
- pip3 install tox-travis git-semver
script:
- ./.travis/test.sh
deploy:
provider: script
skip_cleanup: true
cleanup: true
script: .travis/releaser.sh
on:
branch: master
Expand Down
5 changes: 0 additions & 5 deletions .travis/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

set -euo pipefail

if [ ! -d "./molecule/latest" ]; then
tox -- molecule test --all
exit 0
fi

if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
tox -- molecule test --all --destroy always
else
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[tox]
minversion = 1.8
envlist = py3-ansible{27,28,29}
basepython = python3.7
envlist = py37-ansible{27,28,29}
skipsdist = true

[travis:env]
Expand Down