Merge branch '4.1.x' into 4.2.x
This commit is contained in:
2
.github/workflows/deploy-docs.yml
vendored
2
.github/workflows/deploy-docs.yml
vendored
@@ -16,7 +16,7 @@ jobs:
|
||||
# if: github.repository_owner == 'spring-cloud'
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: docs-build
|
||||
fetch-depth: 1
|
||||
|
||||
6
.github/workflows/maven.yml
vendored
6
.github/workflows/maven.yml
vendored
@@ -5,9 +5,9 @@ name: Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ main, 3.1.x ]
|
||||
branches: [ main, 4.2.x, 4.1.x ]
|
||||
pull_request:
|
||||
branches: [ main, 3.1.x ]
|
||||
branches: [ main, 4.2.x, 4.1.x ]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
@@ -15,7 +15,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set up JDK
|
||||
uses: actions/setup-java@v2
|
||||
with:
|
||||
|
||||
Reference in New Issue
Block a user