Skip to content

Commit

Permalink
Address issues with newer bundler on RHEL8 and RHEL9
Browse files Browse the repository at this point in the history
  • Loading branch information
treydock committed Jun 22, 2023
1 parent 5e0c84c commit ef4b4de
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions packaging/rpm/ondemand.spec
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ BuildRequires: rsync
BuildRequires: git
BuildRequires: python3
BuildRequires: libffi-devel
BuildRequires: libyaml-devel

Requires: git
Requires: sudo, lsof, cronie, wget, curl, make, rsync, file, libxml2, libxslt, zlib, lua-posix, diffutils
Expand Down Expand Up @@ -138,13 +139,23 @@ set -e
export GEM_HOME=$(pwd)/gems-build
export GEM_PATH=$(pwd)/gems-build:$GEM_PATH
%ifarch aarch64
# Force downgrade of bundler to avoid bugs with 2.3.7
# TODO: Remove if/when using dedicated ondemand-bundler RPM
%if 0%{?rhel} && 0%{?rhel} > 7
pushd apps/dashboard
bundle update --bundler=2.3.6
popd
pushd apps/myjobs
bundle update --bundler=2.3.6
popd
%endif
%if 0%{?rhel} && 0%{?rhel} < 9
# Nokogiri and possibly other gems will fail to build on older aarch64 and glibc
bundle config set force_ruby_platform true
bundle config set --global force_ruby_platform true
%endif
%endif
%ifarch ppc64le
bundle config set force_ruby_platform true
bundle config set --global force_ruby_platform true
%endif
BUNDLE_WITHOUT='test package' bundle install
rake --trace -mj%{ncpus} build
Expand Down

0 comments on commit ef4b4de

Please sign in to comment.