Skip to content

Commit 696795d

Browse files
Robert MarshallbalasankarcLin Jen-Shin
committed
Merge branch 'upgrade-omnibus-ctl-for-ruby-322-compat' into 'master'
Upgrade omnibus-ctl for Ruby 3.2.2 compatibility See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7371 Merged-by: Robert Marshall <[email protected]> Approved-by: Robert Marshall <[email protected]> Reviewed-by: Balasankar 'Balu' C <[email protected]> Co-authored-by: Balasankar 'Balu' C <[email protected]> Co-authored-by: Lin Jen-Shin <[email protected]>
2 parents aa7feaf + abd6802 commit 696795d

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

config/software/omnibus-ctl.rb

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717

1818
name 'omnibus-ctl'
19-
version = Gitlab::Version.new('omnibus-ctl', '0.6.0.1')
19+
version = Gitlab::Version.new('omnibus-ctl', 'v0.6.12')
2020
default_version version.print(false)
2121
display_version version.print(false)
2222

@@ -38,6 +38,22 @@
3838
# Remove existing built gems in case they exist in the current dir
3939
delete 'omnibus-ctl-*.gem'
4040

41+
# Install chef-utils and chef-config from Packagecloud server. Their version
42+
# should match that of chef-gem
43+
gem 'install chef-utils ' \
44+
'--clear-sources ' \
45+
"--version '18.3.0' " \
46+
'-s https://packagecloud.io/cinc-project/stable ' \
47+
'-s https://rubygems.org ' \
48+
'--no-document', env: env
49+
50+
gem 'install chef-config ' \
51+
'--clear-sources ' \
52+
"--version '18.3.0' " \
53+
'-s https://packagecloud.io/cinc-project/stable ' \
54+
'-s https://rubygems.org ' \
55+
'--no-document', env: env
56+
4157
gem 'build omnibus-ctl.gemspec', env: env
4258
gem 'install omnibus-ctl-*.gem --no-document', env: env
4359

0 commit comments

Comments
 (0)