Skip to content

Commit b133e1b

Browse files
Andrew PattersonClemens Beck
andcommitted
Merge branch 'update-deps-yaml-for-chef-18' into 'master'
Update deps io config for chef 18 See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7385 Merged-by: Andrew Patterson <[email protected]> Approved-by: Andrew Patterson <[email protected]> Approved-by: Mitchell Nielsen <[email protected]> Co-authored-by: Clemens Beck <[email protected]>
2 parents 101f779 + 6c8a188 commit b133e1b

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

deps.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,24 @@ dependencies:
4444
- filename: config/software/alertmanager.rb
4545
pattern: "Gitlab::Version.new\\('alertmanager', '(\\S+)'\\)"
4646
tag_prefix: 'v'
47-
# chef-gem
47+
# chef
4848
https://github.com/chef/chef.git:
4949
replace_in_files:
5050
- filename: config/software/chef-gem.rb
5151
pattern: "default_version '(\\S+)'"
5252
tag_prefix: 'v'
53-
range: '<= 17.x'
54-
# ohai
53+
range: '<= 18.x'
54+
- filename: config/software/chef-bin.rb
55+
pattern: "default_version '(\\S+)'"
56+
tag_prefix: 'v'
57+
range: '<= 18.x'
58+
# ohai
5559
https://github.com/chef/ohai.git:
5660
replace_in_files:
5761
- filename: config/software/ohai.rb
5862
pattern: "default_version '(\\S+)'"
5963
tag_prefix: 'v'
60-
range: '<= 17.x'
64+
range: '<= 18.x'
6165
# mixlib-log
6266
https://github.com/chef/mixlib-log.git:
6367
replace_in_files:

0 commit comments

Comments
 (0)