diff --git a/scripts/setup-app.sh b/.ci/setup-heroku.sh similarity index 80% rename from scripts/setup-app.sh rename to .ci/setup-heroku.sh index b6502527..6e9e07c7 100755 --- a/scripts/setup-app.sh +++ b/.ci/setup-heroku.sh @@ -1,6 +1,6 @@ -#!/bin/sh -set -e -set -x +#!/usr/bin/env bash +set -eu +set -o pipefail heroku apps:destroy --app play-authenticate --confirm play-authenticate heroku apps:create play-authenticate diff --git a/.travis.yml b/.travis.yml index ef9d91b3..0522a25c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,4 +50,4 @@ env: - secure: "ADkRhMtW2uzNT8gPxKuBYE5tc1WCSrtWKvEy2wpOehR8KbpN5PYnYk7rWE3H4YnRwSXn38VuTVL2Lyc4HWNB3VWqSLeIegzQQ0ie5Yt5DtG6lbgYXWtgUsUsH1E5H/ozKhthfDASCONHv0zqZC6sJci6EAT+HiX80ilQ0h386jA=" after_success: - '[[ $TRAVIS_BRANCH == "master" ]] && { cd $TRAVIS_BUILD_DIR/code && sbt --info ++$TRAVIS_SCALA_VERSION -Dtravis=1 publish; };' -- '[[ $TRAVIS_BRANCH == "master" ]] && { $TRAVIS_BUILD_DIR/scripts/setup-app.sh && cd $TRAVIS_BUILD_DIR/samples/java/play-authenticate-usage && sbt --info ++$TRAVIS_SCALA_VERSION stage deployHeroku; };' +- '[[ $TRAVIS_BRANCH == "master" ]] && { $TRAVIS_BUILD_DIR/.ci/setup-heroku.sh && cd $TRAVIS_BUILD_DIR/samples/java/play-authenticate-usage && sbt --info ++$TRAVIS_SCALA_VERSION stage deployHeroku; };' diff --git a/LICENSE b/LICENSE index f52b424c..639777e7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2016 Joscha Feth +Copyright 2017 Joscha Feth Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.