From 94415387f6448cc47af7d58330016a35c59ce5d2 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Sat, 28 Dec 2019 12:13:34 +0100 Subject: [PATCH] Changed circleci setup --- .circleci/config.yml | 3 +-- scripts/runAcceptanceTests.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5042257..17ec763 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,6 @@ jobs: branches: ignore: - gh-pages # list of branches to ignore - resource_class: large steps: - checkout - restore_cache: @@ -24,7 +23,7 @@ jobs: - ~/.m2 - run: name: "Running build" - command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --fail-at-end + command: ./scripts/runAcceptanceTests.sh - run: name: "Aggregate test results" when: always diff --git a/scripts/runAcceptanceTests.sh b/scripts/runAcceptanceTests.sh index a1aedb5..0fcf5a8 100755 --- a/scripts/runAcceptanceTests.sh +++ b/scripts/runAcceptanceTests.sh @@ -27,7 +27,7 @@ function build() { echo "Updating parent boot to [${CURRENT_BOOT_VERSION}]" ./mvnw versions:update-parent "-DparentVersion=(,${CURRENT_BOOT_VERSION}]" -DgenerateBackupPoms=false -DallowSnapshots=true echo "Running the build with cloud version [${CURRENT_CLOUD_VERSION}]" - ./mvnw clean install -Dspring-cloud.version="${CURRENT_CLOUD_VERSION}" + ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -Dspring-cloud.version="${CURRENT_CLOUD_VERSION}" -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --fail-at-end } cat <