From 1e55907aee49c899dc7d39a5ea4daa6e4b9b7649 Mon Sep 17 00:00:00 2001
From: Wendel Fabian Chinsamy <wendel.chinsamy@datacite.org>
Date: Thu, 28 Mar 2024 17:33:26 +0200
Subject: [PATCH] removing ruby 3 changes before adding them back

---
 .github/workflows/deploy.yml      |  2 +-
 .github/workflows/parallel_ci.yml |  2 +-
 .github/workflows/release.yml     |  2 +-
 Dockerfile                        |  6 +++---
 Gemfile                           | 12 ++++++------
 Gemfile.lock                      |  2 +-
 bin/update                        |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 012f6193..590cb219 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -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
diff --git a/.github/workflows/parallel_ci.yml b/.github/workflows/parallel_ci.yml
index 25d23b88..ce143ba3 100644
--- a/.github/workflows/parallel_ci.yml
+++ b/.github/workflows/parallel_ci.yml
@@ -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
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 33c1aa90..82495c21 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -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
diff --git a/Dockerfile b/Dockerfile
index 4ab184aa..d82aaec4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM phusion/passenger-full:2.5.1
+FROM phusion/passenger-full:2.0.1
 LABEL maintainer="kgarza@datacite.org"
 
 # Set correct environment variables.
@@ -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" && \
@@ -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
diff --git a/Gemfile b/Gemfile
index 6bed7797..5eefea65 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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"
@@ -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
diff --git a/Gemfile.lock b/Gemfile.lock
index e1d72b38..c925e153 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -518,4 +518,4 @@ DEPENDENCIES
   webmock (~> 3.1)
 
 BUNDLED WITH
-   2.5.6
\ No newline at end of file
+   2.4.20
\ No newline at end of file
diff --git a/bin/update b/bin/update
index c3eb787c..084f8f8a 100755
--- a/bin/update
+++ b/bin/update
@@ -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 =="