Skip to content

Commit

Permalink
removing ruby 3 changes before adding them back
Browse files Browse the repository at this point in the history
  • Loading branch information
wendelfabianchinsamy committed Mar 28, 2024
1 parent b641e61 commit 1e55907
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Ruby 3.1
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.1.4'
ruby-version: '2.6'
- uses: actions/cache@v3
with:
path: vendor/bundle
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/parallel_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Set up Ruby 3.1
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.1.4"
ruby-version: "2.6"
bundler-cache: true

- name: Run Specs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Ruby 3.1
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.1.4'
ruby-version: '2.6'
- uses: actions/cache@v3
with:
path: vendor/bundle
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/passenger-full:2.5.1
FROM phusion/passenger-full:2.0.1
LABEL maintainer="[email protected]"

# Set correct environment variables.
Expand All @@ -12,7 +12,7 @@ RUN usermod -a -G docker_env app
CMD ["/sbin/my_init"]

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

# Update installed APT packages
RUN apt-get update && apt-get upgrade -y --allow-unauthenticated -o Dpkg::Options::="--force-confold" && \
Expand Down 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
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -518,4 +518,4 @@ DEPENDENCIES
webmock (~> 3.1)

BUNDLED WITH
2.5.6
2.4.20
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

0 comments on commit 1e55907

Please sign in to comment.