From a52c8d4ae0cc439d535ff850de9e710835db4d21 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Wed, 16 Aug 2017 23:41:17 +0200 Subject: [PATCH] test_release, test_master --- .travis.yml | 14 +++++++++++++- Makefile | 8 ++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4f9cf73..118bf7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,18 @@ sudo: required services: - docker - + script: - make build + +deploy: + - provider: script + script: make test_release + on: + branch: master + tags: true + condition: "$TRAVIS_TAG =~ ^[0-9]+(\.[0-9]+)*$" + - provider: script + script: make test_master + on: + branch: master diff --git a/Makefile b/Makefile index 75196aa..ce7031e 100644 --- a/Makefile +++ b/Makefile @@ -26,3 +26,11 @@ ssh: IP=$$(docker inspect $$ID | grep IPAddr | sed 's/.*: "//; s/".*//') && \ echo "SSHing into $$IP" && \ ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i image/services/sshd/keys/insecure_key root@$$IP + +test_release: + echo test_release + env + +test_master: + echo test_master + env