From e549837f4fc5bf4a729d99f6ca10b1dcdbc8d29b Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 18 Jul 2017 10:25:56 +0200 Subject: [PATCH 1/2] Added Circle CI 2.0 support --- .circleci/config.yml | 53 ++++++++++++++++++++++++++++++++++++++++++++ circle.yml | 4 ++-- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000000..426013ec63 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,53 @@ +version: 2 +jobs: + build: + docker: + - image: springcloud/pipeline-base + environment: + _JAVA_OPTIONS: "-Xms512m -Xmx768m" + GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx768m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false' + TERM: dumb + branches: + ignore: + - gh-pages # list of branches to ignore + resource_class: large + steps: + - checkout + - restore_cache: + key: sc-contract-{{ .Branch }} + - run: + name: "Download dependencies" + command: ./scripts/downloadDependencies.sh + - save_cache: + key: sc-contract-{{ .Branch }} + paths: + - ~/.m2 + - ~/.gradle + - run: + name: "Adding daemon entries for Gradle" + command: touch ~/.gradle/gradle.properties && echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties + - run: + name: "Clearing caches" + command: rm -rf ~/.m2/repository/org/springframework/cloud/contract && rm -rf ~/.m2/repository/com/example + - run: + name: "Running build" + command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -Pdocs,integration,sonar -nsu --batch-mode -Dsurefire.rerunFailingTestsCount=2 -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - run: + name: "Aggregate test results" + when: always + command: | + mkdir -p $CIRCLE_TEST_REPORTS/junit/ + find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; + find . -type f -regex ".*/build/test-results/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; + bash <(curl -s https://codecov.io/bash) + - store_artifacts: + path: /junit/ + destination: artifacts + - store_test_results: + path: /junit/ + destination: testartifacts +notify: + webhooks: + # A list of hook hashes, containing the url field + # gitter hook + - url: https://webhooks.gitter.im/e/ece0ece9a76a5af2aa91 diff --git a/circle.yml b/circle.yml index 2b9494db26..36a3437564 100644 --- a/circle.yml +++ b/circle.yml @@ -6,8 +6,8 @@ machine: java: version: oraclejdk8 environment: - _JAVA_OPTIONS: "-Xms512m -Xmx600m" - GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx600m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false' + _JAVA_OPTIONS: "-Xms512m -Xmx768m" + GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx768m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false' TERM: dumb dependencies: pre: From 11b864dada4249ceeb5c2be7ed7113ea1cb85a2f Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 19 Jul 2017 11:14:56 +0200 Subject: [PATCH 2/2] Updated Boot version --- samples/standalone/messaging/stream-sink/build.gradle | 2 +- samples/standalone/messaging/stream-sink/pom.xml | 2 +- samples/standalone/messaging/stream-source/build.gradle | 2 +- samples/standalone/messaging/stream-source/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/standalone/messaging/stream-sink/build.gradle b/samples/standalone/messaging/stream-sink/build.gradle index 0629042ea2..804e0a1224 100644 --- a/samples/standalone/messaging/stream-sink/build.gradle +++ b/samples/standalone/messaging/stream-sink/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.3.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.4.RELEASE" } } diff --git a/samples/standalone/messaging/stream-sink/pom.xml b/samples/standalone/messaging/stream-sink/pom.xml index 6d75504f00..7aeb443369 100644 --- a/samples/standalone/messaging/stream-sink/pom.xml +++ b/samples/standalone/messaging/stream-sink/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.3.RELEASE + 1.5.4.RELEASE diff --git a/samples/standalone/messaging/stream-source/build.gradle b/samples/standalone/messaging/stream-source/build.gradle index 3d25eaaec9..3a07715390 100644 --- a/samples/standalone/messaging/stream-source/build.gradle +++ b/samples/standalone/messaging/stream-source/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.3.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.4.RELEASE" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" classpath "io.rest-assured:rest-assured:3.0.2" classpath "io.rest-assured:spring-mock-mvc:3.0.2" diff --git a/samples/standalone/messaging/stream-source/pom.xml b/samples/standalone/messaging/stream-source/pom.xml index 1af906adb4..de346a6762 100644 --- a/samples/standalone/messaging/stream-source/pom.xml +++ b/samples/standalone/messaging/stream-source/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.3.RELEASE + 1.5.4.RELEASE