From b56e755d0d725f3e5e07abc74d986a642037ef54 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Mon, 26 Apr 2021 18:57:22 +0200 Subject: [PATCH] Revert "Switch to GH actions." This reverts commit 04ef589ad2673a46b142ac8e0d690e53832a7294. --- .circleci/config.yml | 39 ++++++++++++++++++++++++++++++ .github/workflows/maven.yml | 35 --------------------------- README.adoc | 2 +- docs/src/main/asciidoc/README.adoc | 2 +- 4 files changed, 41 insertions(+), 37 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 .github/workflows/maven.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000..51328131 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,39 @@ +version: 2 +jobs: + build: + docker: + - image: springcloud/pipeline-base + user: appuser + environment: + _JAVA_OPTIONS: "-Xms1024m -Xmx2048m" + TERM: dumb + branches: + ignore: + - gh-pages # list of branches to ignore + steps: + - checkout + - restore_cache: + key: sc-commons-{{ .Branch }} + - run: + name: "Download dependencies" + command: ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true + - save_cache: + key: sc-commons-{{ .Branch }} + paths: + - ~/.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 + - run: + name: "Aggregate test results" + when: always + command: | + mkdir -p ~/junit/ + find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \; + bash <(curl -s https://codecov.io/bash) + - store_artifacts: + path: ~/junit/ + destination: artifacts + - store_test_results: + path: ~/junit/ + destination: testartifacts diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml deleted file mode 100644 index 474a3c94..00000000 --- a/.github/workflows/maven.yml +++ /dev/null @@ -1,35 +0,0 @@ -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - -name: Build - -on: - push: - branches: [ 2.2.x ] - pull_request: - branches: [ 2.2.x ] - -jobs: - build: - - runs-on: ubuntu-latest - - strategy: - matrix: - java: ["8", "11", "16"] - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Cache local Maven repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Build with Maven - run: ./mvnw clean install -B -U diff --git a/README.adoc b/README.adoc index 90cf04a5..8fdcaee7 100644 --- a/README.adoc +++ b/README.adoc @@ -5,7 +5,7 @@ Edit the files in the src/main/asciidoc/ directory instead. //// -image::https://github.com/spring-cloud/spring-cloud-commons/workflows/Build/badge.svg?branch=2.2.x&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-commons/actions"] +image::https://circleci.com/gh/spring-cloud/spring-cloud-commons.svg?style=svg[Build Status, link=https://circleci.com/gh/spring-cloud/spring-cloud-commons] https://pivotal.io/platform-as-a-service/migrating-to-cloud-native-application-architectures-ebook[Cloud Native] is a style of application development that encourages easy adoption of best practices in the areas of continuous delivery and value-driven development. diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index e358b73c..896a56cb 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -1,4 +1,4 @@ -image::https://github.com/spring-cloud/spring-cloud-commons/workflows/Build/badge.svg?branch=2.2.x&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-commons/actions"] +image::https://circleci.com/gh/spring-cloud/spring-cloud-commons.svg?style=svg[Build Status, link=https://circleci.com/gh/spring-cloud/spring-cloud-commons] include::intro.adoc[]