Skip to content

S
spring-boot
Commit 0fd7dd29 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '2.1.x' into 2.2.x

parents 6dc8e681 956ee223
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
ci/pipeline.yml
View file @ 0fd7dd29
...@@ -87,12 +87,12 @@ resource_types: ...@@ -87,12 +87,12 @@ resource_types:
resources: resources:
- name: git-repo - name: git-repo
type: git type: git
icon: github-circle icon: github
source: source:
<<: *git-repo-resource-source <<: *git-repo-resource-source
- name: git-repo-windows - name: git-repo-windows
type: git type: git
icon: github-circle icon: github
source: source:
<<: *git-repo-resource-source <<: *git-repo-resource-source
git_config: git_config:
...@@ -125,7 +125,7 @@ resources: ...@@ -125,7 +125,7 @@ resources:
pre_release: false pre_release: false
- name: ci-images-git-repo - name: ci-images-git-repo
type: git type: git
icon: github-circle icon: github
source: source:
uri: ((github-repo)) uri: ((github-repo))
branch: ((branch)) branch: ((branch))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment