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

Upgraded Rails version for content negotiation #146

Merged
merged 4 commits into from
Nov 20, 2024
Merged
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
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ jobs:
MEMCACHE_SERVERS: "localhost:11211"
steps:
- uses: actions/checkout@v3
- name: Set up Ruby 2.6
- name: Set up Ruby 3.1.4
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
ruby-version: 3.1.4
env:
BUNDLER_VERSION: 2.4.22
- uses: actions/cache@v3
with:
path: vendor/bundle
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ jobs:
SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }}
steps:
- uses: actions/checkout@v3
- name: Set up Ruby 2.6
- name: Set up Ruby 3.1.4
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
ruby-version: 3.1.4
env:
BUNDLER_VERSION: 2.4.22
- uses: actions/cache@v3
with:
path: vendor/bundle
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ jobs:
MEMCACHE_SERVERS: "localhost:11211"
steps:
- uses: actions/checkout@v3
- name: Set up Ruby 2.6
- name: Set up Ruby 3.1.4
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
ruby-version: 3.1.4
env:
BUNDLER_VERSION: 2.4.22
- uses: actions/cache@v3
with:
path: vendor/bundle
Expand Down
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.1.4
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/passenger-full:2.0.0
FROM phusion/passenger-ruby31:3.0.7
LABEL maintainer="[email protected]"

# Set correct environment variables.
Expand All @@ -11,8 +11,8 @@ RUN usermod -a -G docker_env app
# Use baseimage-docker's init process.
CMD ["/sbin/my_init"]

# Use Ruby 2.6.8
RUN bash -lc 'rvm --default use ruby-2.6.8'
# Use Ruby 3.1.6
RUN bash -lc 'rvm --default use ruby-3.1.6'

# Update installed APT packages
RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
Expand All @@ -35,8 +35,8 @@ WORKDIR /home/app/webapp
RUN mkdir -p vendor/bundle && \
chown -R app:app . && \
chmod -R 755 . && \
gem update --system 3.4.22 && \
gem install bundler -v 2.4.22 && \
gem update --system 3.5.6 && \
gem install bundler -v 2.5.6 && \
/sbin/setuser app bundle install --path vendor/bundle

# Copy webapp folder
Expand Down
26 changes: 13 additions & 13 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
source "https://rubygems.org"

gem "rails", "~> 6.1.7"
gem "rails", "~> 7.1", ">= 7.1.3"
gem "dotenv"
gem "oj", ">= 3.1.0"
gem "oj", ">= 2.8.3"
gem "oj_mimic_json", "~> 1.0", ">= 1.0.1"
gem "equivalent-xml", "~> 0.6.0"
gem "nokogiri", ">= 1.10.8"
gem "nokogiri", ">= 1.11.2"
gem "iso8601", "~> 0.9.0"
gem "maremma", '>= 4.9.4', '< 5'
gem 'addressable', '2.8.1'
gem "faraday", "~> 0.17.3"
gem "bolognese", "2.1.1"
gem "maremma", ">= 4.9.4", "<= 5"
gem "addressable", "2.8.1"
gem "faraday", "~> 2.9"
gem "bolognese", "~> 2.3"
gem "json-ld-preloaded", "~> 3.1", ">= 3.1.3"
gem "dalli", "~> 2.7.6"
gem "dalli", "~> 3.2", ">= 3.2.8"
gem "lograge", "~> 0.11.2"
gem "logstash-event", "~> 1.2", ">= 1.2.02"
gem "logstash-logger", "~> 0.26.1"
gem "sentry-raven", "~> 2.9"
gem "sentry-raven", "~> 3.1", ">= 3.1.2"
gem "gender_detector", "~> 0.1.2"
gem "rack-cors", "~> 1.0", require: "rack/cors"
gem "git", "~> 1.5"
gem "git", "~> 1.11"
gem "sprockets", "~> 3.7", ">= 3.7.2"

group :development, :test do
gem "better_errors"
gem "binding_of_caller"
gem "listen", "~> 3.0.5"
gem "listen", "~> 3.5"
gem "rubocop", "~> 1.3", ">= 1.3.1"
gem "rubocop-performance", "~> 1.5", ">= 1.5.1"
gem "rubocop-rails", "~> 2.8", ">= 2.8.1"
gem "spring"
gem "spring-watcher-listen", "~> 2.0.0"
gem 'byebug'
gem "byebug"
gem "rspec-rails", "~> 3.8", ">= 3.8.2"
gem "capybara"
gem "webmock", "~> 3.8", ">= 3.8.2"
gem "vcr", "~> 5.1"
gem 'simplecov', '~> 0.17.1'
gem "simplecov", "~> 0.17.1"
end
Loading
Loading