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

reworking ruby 3 upgrade #174

Merged
merged 4 commits into from
Apr 2, 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
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Install
run: |
cp .env.build .env
gem install bundler -v 2.5.6
gem install bundler -v 2.4.20
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3
- name: Lint and Test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Install
run: |
cp .env.build .env
gem install bundler -v 2.5.6
gem install bundler -v 2.4.20
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3
- name: Lint and Test
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ RUN mkdir -p vendor/bundle && \
chown -R app:app . && \
chmod -R 755 . && \
gem update --system 3.4.22 && \
gem install bundler -v 2.5.6 && \
gem install bundler -v 2.4.20 && \
/sbin/setuser app bundle install --path vendor/bundle

# enable SSH
Expand Down
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gem "dalli", "~> 2.7.6"
gem "dotenv"
gem "equivalent-xml", "~> 0.6.0"
gem "facets", require: false
gem "faraday_middleware-aws-sigv4", "~> 0.3.0"
gem "faraday_middleware-aws-sigv4", "~> 0.2.4"
gem "git", "~> 1.5"
gem "iso8601", "~> 0.9.0"
gem "jwt"
Expand Down Expand Up @@ -56,11 +56,11 @@ end
group :test do
gem "capybara"
gem "codeclimate-test-reporter", "~> 1.0.0"
gem "factory_bot_rails", "~> 6.4", ">= 6.4.3"
gem "faker", "~> 3.2", ">= 3.2.3"
gem "rubocop-rspec", "~> 2.0", require: false
gem "factory_bot_rails", "~> 4.8", ">= 4.8.2"
gem "faker"
gem "rubocop-rspec", "~> 1.28"
gem "shoulda-matchers", "~> 4.1", ">= 4.1.2"
gem "simplecov", "~> 0.22.0"
gem "vcr", "~> 6.1"
gem "simplecov"
gem "vcr", "~> 5.1"
gem "webmock", "~> 3.1"
end
42 changes: 18 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -174,22 +174,22 @@ GEM
erubi (1.10.0)
excon (0.71.1)
facets (3.1.0)
factory_bot (6.4.6)
activesupport (>= 5.0.0)
factory_bot_rails (6.4.3)
factory_bot (~> 6.4)
railties (>= 5.0.0)
faker (3.2.3)
factory_bot (4.11.1)
activesupport (>= 3.0.0)
factory_bot_rails (4.11.1)
factory_bot (~> 4.11.1)
railties (>= 3.0.0)
faker (2.22.0)
i18n (>= 1.8.11, < 2)
faraday (0.17.6)
multipart-post (>= 1.2, < 3)
faraday-encoding (0.0.5)
faraday
faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0)
faraday_middleware-aws-sigv4 (0.3.0)
faraday_middleware-aws-sigv4 (0.2.4)
aws-sigv4 (~> 1.0)
faraday (>= 0.15)
faraday (>= 0.9)
ffi (1.15.5)
gender_detector (0.1.2)
unicode_utils (>= 1.3.0)
Expand Down Expand Up @@ -391,20 +391,14 @@ GEM
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.20.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.25.1)
rubocop (~> 1.41)
rubocop-performance (1.6.1)
rubocop (>= 0.71.0)
rubocop-rails (2.19.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-rspec (2.27.1)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
rubocop-rspec (1.42.0)
rubocop (>= 0.87.0)
ruby-progressbar (1.13.0)
scanf (1.0.0)
sentry-raven (2.13.0)
Expand Down Expand Up @@ -447,7 +441,7 @@ GEM
unicode-display_width (2.5.0)
unicode-types (1.9.0)
unicode_utils (1.4.0)
vcr (6.2.0)
vcr (5.1.0)
webmock (3.14.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
Expand Down Expand Up @@ -480,9 +474,9 @@ DEPENDENCIES
dotenv
equivalent-xml (~> 0.6.0)
facets
factory_bot_rails (~> 6.4, >= 6.4.3)
faker (~> 3.2, >= 3.2.3)
faraday_middleware-aws-sigv4 (~> 0.3.0)
factory_bot_rails (~> 4.8, >= 4.8.2)
faker
faraday_middleware-aws-sigv4 (~> 0.2.4)
git (~> 1.5)
iso8601 (~> 0.9.0)
json-canonicalization (= 0.3.1)
Expand All @@ -504,18 +498,18 @@ DEPENDENCIES
rubocop (~> 1.3, >= 1.3.1)
rubocop-performance (~> 1.5, >= 1.5.1)
rubocop-rails (~> 2.8, >= 2.8.1)
rubocop-rspec (~> 2.0)
rubocop-rspec (~> 1.28)
sentry-raven (~> 2.9)
shoryuken (~> 4.0)
shoulda-matchers (~> 4.1, >= 4.1.2)
simple_command
simplecov (~> 0.22.0)
simplecov
slack-notifier (~> 2.3, >= 2.3.2)
spring
spring-watcher-listen (~> 2.0.0)
sprockets (~> 3.7, >= 3.7.2)
vcr (~> 6.1)
vcr (~> 5.1)
webmock (~> 3.1)

BUNDLED WITH
2.5.6
2.4.20
2 changes: 1 addition & 1 deletion bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ chdir APP_ROOT do
# Add necessary setup steps to this file.

puts "== Installing dependencies =="
system! "gem install bundler -v 2.5.6 --conservative"
system! "gem install bundler -v 2.4.20 --conservative"
system("bundle check") || system!("bundle install")

# puts "\n== Copying sample files =="
Expand Down
2 changes: 1 addition & 1 deletion bin/update
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ chdir APP_ROOT do
# Add necessary update steps to this file.

puts "== Installing dependencies =="
system! "gem install bundler -v 2.5.6 --conservative"
system! "gem install bundler -v 2.4.20 --conservative"
system("bundle check") || system!("bundle install")

puts "\n== Updating database =="
Expand Down
Loading