Skip to content

Commit

Permalink
Merge pull request #178 from datacite/ruby-release-revert
Browse files Browse the repository at this point in the history
revert ruby 3 upgrade
  • Loading branch information
wendelfabianchinsamy authored Apr 3, 2024
2 parents 3efb4e7 + 7028a5e commit 36b67da
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
steps:
- uses: actions/checkout@v3
- name: Set up Ruby 3.1
- name: Set up Ruby 2.6
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.8"
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.8'
- 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="kgarza@datacite.org"

# 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 3.1.4
RUN bash -lc 'rvm --default use ruby-3.1.4'
# Use Ruby 2.6.8
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
4 changes: 2 additions & 2 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.2.4"
gem "faraday_middleware-aws-sigv4", "~> 0.3.0"
gem "git", "~> 1.5"
gem "iso8601", "~> 0.9.0"
gem "jwt"
Expand Down Expand Up @@ -57,7 +57,7 @@ group :test do
gem "capybara"
gem "codeclimate-test-reporter", "~> 1.0.0"
gem "factory_bot_rails", "~> 4.8", ">= 4.8.2"
gem "faker"
gem "faker", "~> 2.22"
gem "rubocop-rspec", "~> 1.28"
gem "shoulda-matchers", "~> 4.1", ">= 4.1.2"
gem "simplecov"
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,9 @@ GEM
faraday
faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0)
faraday_middleware-aws-sigv4 (0.2.4)
faraday_middleware-aws-sigv4 (0.3.0)
aws-sigv4 (~> 1.0)
faraday (>= 0.9)
faraday (>= 0.15)
ffi (1.15.5)
gender_detector (0.1.2)
unicode_utils (>= 1.3.0)
Expand Down Expand Up @@ -475,8 +475,8 @@ DEPENDENCIES
equivalent-xml (~> 0.6.0)
facets
factory_bot_rails (~> 4.8, >= 4.8.2)
faker
faraday_middleware-aws-sigv4 (~> 0.2.4)
faker (~> 2.22)
faraday_middleware-aws-sigv4 (~> 0.3.0)
git (~> 1.5)
iso8601 (~> 0.9.0)
json-canonicalization (= 0.3.1)
Expand Down

0 comments on commit 36b67da

Please sign in to comment.