Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/2.3.x' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
OlgaMaciaszek committed May 13, 2021
2 parents 661f5f8 + 7cc037d commit ab3faae
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 41 deletions.
39 changes: 0 additions & 39 deletions .circleci/config.yml

This file was deleted.

35 changes: 35 additions & 0 deletions .github/workflows/maven.yml
@@ -0,0 +1,35 @@
# 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: [ main ]
pull_request:
branches: [ main ]

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
2 changes: 1 addition & 1 deletion README.adoc
Expand Up @@ -5,7 +5,7 @@ Edit the files in the src/main/asciidoc/ directory instead.
////


image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"]
image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-build/actions"]

Spring Cloud Build is a common utility project for Spring Cloud
to use for plugin and dependency management.
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/README.adoc
@@ -1,4 +1,4 @@
image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"]
image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-build/actions"]

Spring Cloud Build is a common utility project for Spring Cloud
to use for plugin and dependency management.
Expand Down

0 comments on commit ab3faae

Please sign in to comment.