Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Ruby 2.4 #16101

Closed
wants to merge 3 commits into from
Closed

Upgrade to Ruby 2.4 #16101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
632ec2f
Bump Travis to use Ruby 2.4
chrisarcand Oct 3, 2017
fcdfda2
Bump Dockerfile to use Ruby 2.4
chrisarcand Oct 3, 2017
0f7d65d
Drop support for Ruby 2.2
chrisarcand Oct 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
rvm:
- '2.3.5'
- '2.4.2'
sudo: false
cache:
bundler: true
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG REF=master
# Set ENV, LANG only needed if building with docker-1.8
ENV LANG en_US.UTF-8
ENV TERM xterm
ENV RUBY_GEMS_ROOT /opt/rubies/ruby-2.3.1/lib/ruby/gems/2.3.0
ENV RUBY_GEMS_ROOT /opt/rubies/ruby-2.4.2/lib/ruby/gems/2.4.0
ENV APP_ROOT /var/www/miq/vmdb
ENV APPLIANCE_ROOT /opt/manageiq/manageiq-appliance
ENV SUI_ROOT /opt/manageiq/manageiq-ui-service
Expand Down Expand Up @@ -103,8 +103,8 @@ RUN curl -sL https://github.com/postmodern/chruby/archive/v0.3.9.tar.gz | tar xz
curl -sL https://github.com/postmodern/ruby-install/archive/v0.6.0.tar.gz | tar xz && \
cd ruby-install-0.6.0 && \
make install && \
ruby-install ruby 2.3.1 -- --disable-install-doc && \
echo "chruby ruby-2.3.1" >> ~/.bash_profile && \
ruby-install ruby 2.4.2 -- --disable-install-doc && \
echo "chruby ruby-2.4.2" >> ~/.bash_profile && \
rm -rf /chruby-* && \
rm -rf /usr/local/src/* && \
yum clean all
Expand All @@ -123,7 +123,7 @@ ADD . ${APP_ROOT}

## Setup environment
RUN ${APPLIANCE_ROOT}/setup && \
echo "export PATH=\$PATH:/opt/rubies/ruby-2.3.1/bin" >> /etc/default/evm && \
echo "export PATH=\$PATH:/opt/rubies/ruby-2.4.2/bin" >> /etc/default/evm && \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you extract the Docker changes into a separate PR (same reasons as I stated in ManageIQ/manageiq-appliance-build#229 (comment) ). This way we can merge that separately from the Travis/Gemfile bump.

mkdir ${APP_ROOT}/log/apache && \
mv /etc/httpd/conf.d/ssl.conf{,.orig} && \
echo "# This file intentionally left blank. ManageIQ maintains its own SSL configuration" > /etc/httpd/conf.d/ssl.conf && \
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
raise "Ruby versions less than 2.2.2 are unsupported!" if RUBY_VERSION < "2.2.2"
raise "Ruby versions less than 2.3.5 are unsupported!" if RUBY_VERSION < "2.3.5"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jrafanie Is this...ok? Sanity check.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I think this needs to be < 2.3.1 since the oldest 2.3 will be on downstream appliances with the 2.3.1 package cc @simaishi (for confirmation)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, 2.3.1 needs to stay as the supported version until downstream appliances get newer ruby.


source 'https://rubygems.org'

Expand Down