Skip to content

Commit

Permalink
eventuate-foundation#9: Replace env variables by properties. Use grad…
Browse files Browse the repository at this point in the history
…le docker plugin.
  • Loading branch information
dartartem committed Sep 7, 2020
1 parent 5f70324 commit af2c857
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 29 deletions.
11 changes: 5 additions & 6 deletions build-and-test-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@

set -e

. ./set-env.sh
export EVENTUATE_EVENT_TRACKER_ITERATIONS=120

./gradlew testClasses

docker-compose down -v
docker="./gradlew compose"

docker-compose up --build -d

sleep 10
${docker}Down
${docker}Up

./gradlew $GRADLE_OPTIONS cleanTest build $GRADLE_TASK_OPTIONS

docker-compose down -v
${docker}Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ buildscript {
}
dependencies {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath "com.avast.gradle:gradle-docker-compose-plugin:0.13.2"
}
}

apply plugin: 'docker-compose'

allprojects {
group = "io.eventuate.messaging.activemq"
}
Expand Down Expand Up @@ -74,12 +77,6 @@ subprojects {
}
}


task wrapper(type: Wrapper) {
gradleVersion = '4.4'
}


gradle.projectsEvaluated {
task aggregateJavaDocs(type: Javadoc) {
description = 'Aggregated Javadoc API documentation of all subprojects.'
Expand All @@ -92,6 +89,9 @@ gradle.projectsEvaluated {
}
}

dockerCompose {
projectName = null
}



Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
activemq.url=tcp://${DOCKER_HOST_IP:localhost}:61616
activemq.user=eventuateuser
activemq.password=eventuatepassword
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
16 changes: 0 additions & 16 deletions set-env.sh

This file was deleted.

0 comments on commit af2c857

Please sign in to comment.