Skip to content

Commit 4d91370

Browse files
balasankarcstanhu
andcommitted
Merge branch 'sh-add-curl-deps-io' into 'master'
Add curl to deps.yml See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7188 Merged-by: Balasankar 'Balu' C <[email protected]> Approved-by: Balasankar 'Balu' C <[email protected]> Approved-by: Jason Plum <[email protected]> Co-authored-by: Stan Hu <[email protected]>
2 parents 86bd239 + ee65df3 commit 4d91370

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

deps.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,14 @@ dependencies:
212212
tag_filter:
213213
matching: '(\d+).(\d+)'
214214
sort_as: '$1.$2.0'
215+
# curl
216+
https://github.com/curl/curl.git:
217+
replace_in_files:
218+
- filename: config/software/curl.rb
219+
pattern: "version = Gitlab::Version.new\\('curl', '(\\S+)'\\)"
220+
tag_filter:
221+
matching: 'curl-(\d+)_(\d+)_(\d+)'
222+
sort_as: '$1.$2.$3'
215223
# deps that need updated filtering to work https://github.com/dropseed/deps-git/issues/2
216224
# krb5
217225
# https://github.com/krb5/krb5.git:
@@ -225,13 +233,6 @@ dependencies:
225233
# - filename: config/software/libevent.rb
226234
# pattern: "version = Gitlab::Version.new\\('libevent', '(release-\\d+\\.\\d+\\.\\d+-stable)'\\)"
227235
# semver: false
228-
# curl
229-
# https://github.com/curl/curl.git:
230-
# replace_in_files:
231-
# - filename: config/software/curl.rb
232-
# pattern: "version = Gitlab::Version.new\\('curl', 'curl-(\\d+\\_\\d+\\_\\d+)'\\)"
233-
# semver: false
234-
# tag_prefix: 'curl-'
235236
# libicu
236237
# https://github.com/unicode-org/icu.git:
237238
# replace_in_files:

0 commit comments

Comments
 (0)