diff --git a/.travis.yml b/.travis.yml index 485ed36e..030e6009 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,12 @@ before_install: - git config credential.helper "store --file=.git/credentials" - echo "https://$GH_TOKEN:@github.com" > .git/credentials - gem install asciidoctor + - ./src/main/bash/travis_install_consul.sh install: - mvn --settings .settings.xml install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true - ./docs/src/main/asciidoc/ghpages.sh script: +- ./consul agent -server -bootstrap-expect 1 -data-dir /tmp/consul & #TODO: change install to deploy - '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || mvn --settings .settings.xml install -nsu -Dmaven.test.redirectTestOutputToFile=true' - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || mvn --settings .settings.xml install -nsu -Dmaven.test.redirectTestOutputToFile=true' diff --git a/run_consul.sh b/src/main/bash/local_run_consul.sh similarity index 66% rename from run_consul.sh rename to src/main/bash/local_run_consul.sh index 6d64e781..f3aac7f6 100755 --- a/run_consul.sh +++ b/src/main/bash/local_run_consul.sh @@ -1,2 +1,2 @@ #!/bin/bash -consul agent -server -bootstrap-expect 1 -data-dir /tmp/consul -ui-dir `dirname $0`/consul_ui +consul agent -server -bootstrap-expect 1 -data-dir /tmp/consul -ui-dir `dirname $0`/../../../consul_ui diff --git a/src/main/bash/travis_install_consul.sh b/src/main/bash/travis_install_consul.sh new file mode 100755 index 00000000..62a782e5 --- /dev/null +++ b/src/main/bash/travis_install_consul.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +CONSUL_VER="0.5.0_linux_amd64" +# cleanup +rm "${CONSUL_VER}.*" +rm "consul" +# install consul +wget "https://dl.bintray.com/mitchellh/consul/${CONSUL_VER}.zip" +unzip "${CONSUL_VER}.zip" +# check +./consul --version \ No newline at end of file