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.

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

💎 Ruby 2.7 #2521

Draft
wants to merge 22 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: 💎 Setup Ruby and install RubyGems
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.4.4
ruby-version: 2.7
bundler-cache: true

- name: 👮 Run Rubocop code analyzer and Formatter
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ jobs:
specs:
name: 📋 Run Specs
runs-on: ubuntu-latest

steps:
- name: 📰 Checkout code
uses: actions/checkout@v3
Expand All @@ -19,11 +18,13 @@ jobs:
- name: 💎 Setup Ruby and install RubyGems
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.4.4
ruby-version: 2.7
bundler-cache: true

- name: 🛤️ Start Rails
run: nohup bundle exec rails server &

- name: ✔️ Run Rspec specs using CI config
run: bundle exec rake ci_specs
run: |
bundle exec rake db:migrate RAILS_ENV=test
bundle exec rake ci_specs
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
FROM ruby:2.4.4
FROM ruby:2.7
WORKDIR /usr/src/app

RUN apt update && apt install -y nodejs curl libcurl3 libcurl3-openssl-dev openjdk-8-jdk && apt-get clean

RUN apt update && apt install -y nodejs curl libcurl4 libcurl4-openssl-dev default-jdk
RUN gem install bundler -v '~> 1.17.3'
RUN rm /usr/local/lib/ruby/gems/2.7.0/specifications/default/bundler-2.1.4.gemspec
COPY Gemfile Gemfile.lock ./

RUN bundle install
RUN gem update --system

EXPOSE 3000

Expand Down
11 changes: 6 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source 'https://rubygems.org'

# Specify specific version of ruby with which the app is compatible.
ruby '2.4.4'
ruby '~> 2.7.0'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.8'
gem 'rails', '~> 4.2.8'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.3.13'
# gem 'mysql2', :group => :production
Expand Down Expand Up @@ -47,14 +47,15 @@ gem 'cmless', git: 'https://github.com/WGBH-MLA/cmless.git'
gem 'htmlentities', '~> 4.3.2'
gem 'curb' # curl

gem 'blacklight', '5.19.2'
gem 'blacklight', '~> 6.0'
gem 'blacklight-gallery', '0.4.1'
gem 'blacklight-marc'

gem 'solrizer'
gem 'rsolr'
gem 'jettywrapper'

gem 'blacklight_range_limit', '5.2.0'
gem 'blacklight_range_limit', '~> 6.0.0'

gem 'actionpack-page_caching'
gem 'srt'
Expand Down Expand Up @@ -85,7 +86,7 @@ gem 'pry-nav', :group => :development

gem 'passenger', :group => :production

gem 'nokogiri', '~> 1.10.4'
gem 'nokogiri', '~> 1.13.10'

# its back
gem 'bigdecimal', '1.4.4'
Expand Down
Loading