spring/spring-cloud-netflix
1
0
Fork 0
mirror of https://github.com/spring-cloud/spring-cloud-netflix.git synced 2026-10-06 11:49:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.3.x'

Browse Source 
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>

# Conflicts:
#	.github/workflows/maven.yml
This commit is contained in:
Olga Maciaszek-Sharma
2025-09-11 14:53:11 +02:00
parent dd8855dfe6 738f5f8a05
commit 9dbf8dc87a
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/deploy-docs.yml
+1 -1
View File
@@ -16,7 +16,7 @@ jobs:
# if: github.repository_owner == 'spring-cloud'
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
ref: docs-build
fetch-depth: 1
.github/workflows/maven.yml
+4 -4
View File
@@ -5,9 +5,9 @@ name: Build
on:
push:
branches: [ main, 4.3.x, 4.2.x, 4.1.x ]
branches: [ main, 4.3.x, 4.2.x ]
pull_request:
branches: [ main, 4.3.x, 4.2.x, 4.1.x ]
branches: [ main, 4.3.x, 4.2.x ]
jobs:
build:
@@ -15,9 +15,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Set up JDK
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '17'