Skip to content

Commit

Permalink
Update travis and circleci conf to use new cli script
Browse files Browse the repository at this point in the history
  • Loading branch information
bguerout committed Mar 21, 2018
1 parent 1fbd2d3 commit fada6b4
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 117 deletions.
14 changes: 5 additions & 9 deletions .travis.yml
@@ -1,12 +1,8 @@
language: bash
language: java

sudo: required

services:
- docker

before_install:
- docker build -t jongo-ci .
cache:
directories:
- $HOME/.m2

script:
- docker run -it -w /root/sources jongo-ci bash build.sh --job CI
- mvn clean verify
6 changes: 3 additions & 3 deletions bin/cli.sh
Expand Up @@ -34,7 +34,7 @@ function usage {
echo "Note that by default all tasks are ran in dry mode. Set '--dry-run false' to run it for real. "
echo
echo " -b, --branch The branch where task will be executed (default: master)"
echo " -t, --tag The tag used to deploy artifacts (only used by deploy task)"
echo " -t, --tag The tag used to deploy artifacts (required for deploy task)"
echo " -d, --dry-run Run task in dry mode. Nothing will be pushed nor deployed (default: true)"
echo " --early Run Maven with the early profile"
echo " --gpg-file Path the GPG file used to sign artifacts"
Expand All @@ -55,7 +55,7 @@ function usage {
echo " --branch master"
echo ""
echo " Deploy a version from inside a docker container."
echo " Note that on macOS you can emulate SSH forwarding with https://github.com/avsm/docker-ssh-agent-forward:"
echo " Note that on macOS you can emulate SSH forwarding with https://github.com/nardeas/docker-ssh-agent:"
echo ""
echo " docker build bin -t jongo-docker-image && \\"
echo " docker run -it \\"
Expand Down Expand Up @@ -151,7 +151,7 @@ function __main() {
echo ""

log_info "Cloning repository..."
local repo_dir=$(clone_repository "git@github.com:bguerout/jongo.git")
local repo_dir=$(clone_repository "https://github.com/bguerout/jongo.git")
[[ "${dry_run}" = true ]] && configure_dry_mode "${repo_dir}" || safeguard "${task}"

pushd "${repo_dir}" > /dev/null
Expand Down
96 changes: 0 additions & 96 deletions build.sh

This file was deleted.

12 changes: 3 additions & 9 deletions circle.yml
@@ -1,16 +1,10 @@
machine:
services:
- docker
cache_directories:
- "~/.m2"

branches:
ignore:
- gh-pages
- site

dependencies:
override:
- docker info
- docker build -t jongo-ci .
test:
override:
- docker run -it -w /root/sources jongo-ci bash build.sh --job CI
- ./bin/cli.sh test

0 comments on commit fada6b4

Please sign in to comment.