Skip to content
Snippets Groups Projects
Commit c5c7b1d7 authored by DJ Mountney's avatar DJ Mountney
Browse files

Merge branch '7267-fix-ohai-build' into 'master'

Install chef-config 17.10.19 before installing Ohai

Closes #7267

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6466



Merged-by: default avatarDJ Mountney <dj@gitlab.com>
Approved-by: default avatarDJ Mountney <dj@gitlab.com>
Co-authored-by: default avatarBalasankar "Balu" C <balasankar@gitlab.com>
parents 268716b7 a5faecdd
No related branches found
No related tags found
2 merge requests!102heptapod#1237: making 0.38 the new oldstable,!87Merged upstream 15.6.0+ce.0 with adaptations into heptapod branch
......@@ -32,6 +32,10 @@
patch source: "license/add-notice-file.patch"
env = with_standard_compiler_flags(with_embedded_path)
# Install a known good version of chef-config to workaround
# https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/7267
gem "install chef-config --version '17.10.19' --no-document", env: env
gem 'install ohai' \
" --version '#{version}'" \
" --bindir '#{install_dir}/embedded/bin'" \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment