diff options
| author | John Snow <thelunaticscripter@outlook.com> | 2020-04-24 13:57:18 -0400 |
|---|---|---|
| committer | John Snow <thelunaticscripter@outlook.com> | 2020-04-24 13:57:18 -0400 |
| commit | 1ebfe0eef4d3d0d43ea58c6fad43168aa368e2b0 (patch) | |
| tree | 51febf3f2bbbfcab7af38956b30e55eaabd7b8a1 /habitat | |
| parent | aacef41958c25100720205a5c70e6727175f7fa6 (diff) | |
| download | chef-1ebfe0eef4d3d0d43ea58c6fad43168aa368e2b0.tar.gz | |
Fix linux plan to use ruby 2.7
Signed-off-by: John Snow <thelunaticscripter@outlook.com>
Diffstat (limited to 'habitat')
| -rw-r--r-- | habitat/plan.sh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/habitat/plan.sh b/habitat/plan.sh index 7dc47d5e37..6e113e8a95 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -4,6 +4,7 @@ pkg_maintainer="The Chef Maintainers <humans@chef.io>" pkg_description="The Chef Infra Client" pkg_license=('Apache-2.0') pkg_bin_dirs=(bin) +_chef_client_ruby="core/ruby27" pkg_build_deps=( core/make core/gcc @@ -11,13 +12,12 @@ pkg_build_deps=( ) pkg_deps=( core/glibc - core/ruby26 + $_chef_client_ruby core/libxml2 core/libxslt core/libiconv core/xz core/zlib - core/bundler core/openssl core/cacerts core/libffi @@ -64,7 +64,6 @@ do_prepare() { } do_build() { - local _bundler_dir local _libxml2_dir local _libxslt_dir local _zlib_dir @@ -73,21 +72,19 @@ do_build() { export GEM_PATH export NOKOGIRI_CONFIG - _bundler_dir=$(pkg_path_for bundler) _libxml2_dir=$(pkg_path_for libxml2) _libxslt_dir=$(pkg_path_for libxslt) _zlib_dir=$(pkg_path_for zlib) CPPFLAGS="${CPPFLAGS} ${CFLAGS}" GEM_HOME=${pkg_prefix}/bundle - GEM_PATH=${_bundler_dir}:${GEM_HOME} + GEM_PATH=${GEM_HOME} NOKOGIRI_CONFIG="--use-system-libraries \ --with-zlib-dir=${_zlib_dir} \ --with-xslt-dir=${_libxslt_dir} \ --with-xml2-include=${_libxml2_dir}/include/libxml2 \ --with-xml2-lib=${_libxml2_dir}/lib" - build_line "Executing bundle install inside hab-cache path. ($CACHE_PATH/chef-config)" ( cd "$CACHE_PATH/chef-config" || exit_with "unable to enter hab-cache directory" 1 bundle config --local build.nokogiri "${NOKOGIRI_CONFIG}" @@ -118,7 +115,7 @@ do_install() { build_line "Fixing bin/ruby and bin/env interpreters" fix_interpreter "${pkg_prefix}/bin/*" core/coreutils bin/env - fix_interpreter "${pkg_prefix}/bin/*" core/ruby26 bin/ruby + fix_interpreter "${pkg_prefix}/bin/*" "$_chef_client_ruby" bin/ruby } do_end() { @@ -140,9 +137,9 @@ _bundle_install() { bundle install ${*:-} \ --jobs "$(nproc)" \ - --without development:test \ + --without development:test:docgen \ --path "$path" \ - --shebang="$(pkg_path_for "core/ruby26")/bin/ruby" \ + --shebang="$(pkg_path_for "$_chef_client_ruby")/bin/ruby" \ --no-clean \ --retry 5 \ --standalone |