Merge branch '2.1.x' into 2.2.x
This commit is contained in:
commit
0fd7dd297a
|
|
@ -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:
|
||||||
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))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue