From cdb93f178b875e1118a58446ec16380affe7fb61 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 28 Aug 2019 10:50:26 +0200 Subject: [PATCH] Trying to fix circle --- .circleci/config.yml | 6 +++--- scripts/ciBuild.sh | 11 +++++++++++ scripts/gradleOnly.sh | 11 +++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100755 scripts/ciBuild.sh create mode 100755 scripts/gradleOnly.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 7a761f3f01..9d8f3e055b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,8 +4,8 @@ jobs: docker: - image: cloudpipelines/pipeline-base environment: - JAVA_TOOL_OPTIONS: "-Xms128m -Xmx250m" - GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xms128m -Xmx250m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false' + JAVA_TOOL_OPTIONS: "-Xms64m -Xmx250m" + GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xms64m -Xmx250m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false' TERM: dumb branches: ignore: @@ -32,7 +32,7 @@ jobs: command: rm -rf ~/.m2/repository/org/springframework/cloud/contract && rm -rf ~/.m2/repository/com/example - run: name: "Running build" - command: ./scripts/noIntegration.sh && ./scripts/integrationOnly.sh + command: ./scripts/ciBuild.sh - run: name: "Aggregate test results" when: always diff --git a/scripts/ciBuild.sh b/scripts/ciBuild.sh new file mode 100755 index 0000000000..7e91efbaa1 --- /dev/null +++ b/scripts/ciBuild.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +source common.sh || source scripts/common.sh || echo "No common.sh script found..." + +FOLDER=`pwd` + +set -e + +./scripts/noIntegration.sh -Pfast +./scripts/gradleOnly.sh +./scripts/integrationOnly.sh diff --git a/scripts/gradleOnly.sh b/scripts/gradleOnly.sh new file mode 100755 index 0000000000..acd2f993d5 --- /dev/null +++ b/scripts/gradleOnly.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +source common.sh || source scripts/common.sh || echo "No common.sh script found..." + +FOLDER=`pwd` + +set -e + +cd "${FOLDER}/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin" + ./gradlew clean build install +cd "${FOLDER}" \ No newline at end of file