Test against newer Ruby and Bundler (OSC#772)

Update runtime dependencies OSC#772. This bumps ruby up to version 2.7 (up from 2.5), bundler to 2.1 (up from 1.7) and nodejs up to 12 (up from 10).
ryanbcox · Dec 29, 2020 · 7a41857 · 7a41857
1 parent 7815e14
commit 7a41857
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,8 +11,8 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"]
-        ruby: ["2.5.5"]
-        bundler: ["1.17.3"]
+        ruby: ["2.7.1"]
+        bundler: ["2.1.4"]
     runs-on: ${{ matrix.os }}
     name: Unit tests
 
@@ -30,7 +30,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('apps/*/Gemfile.lock') }}
+          key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('apps/*/Gemfile.lock') }}
 
       - name: Setup Bundler
         run: |
@@ -56,9 +56,9 @@ jobs:
       - name: Setup Ruby using Bundler
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.5.5"
+          ruby-version: "2.7.1"
           bundler-cache: true
-          bundler: "1.17.3"
+          bundler: "2.1.4"
 
       - name: Run E2E tests
         run: bundle exec rake test:e2e
diff --git a/Dockerfile b/Dockerfile
@@ -9,6 +9,7 @@ RUN dnf -y install https://yum.osc.edu/ondemand/latest/ondemand-release-web-late
 
 # install all the dependencies
 RUN dnf -y update && \
+    dnf -y module enable nodejs:12 ruby:2.7 && \
     dnf install -y \
         file \
         lsof \

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -35,4 +35,4 @@ DEPENDENCIES
   watir
 
 BUNDLED WITH
-   1.17.3
+   2.1.4
diff --git a/apps/activejobs/Gemfile.lock b/apps/activejobs/Gemfile.lock
@@ -229,4 +229,4 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4
diff --git a/apps/dashboard/Gemfile.lock b/apps/dashboard/Gemfile.lock
@@ -262,4 +262,4 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4
diff --git a/apps/file-editor/Gemfile.lock b/apps/file-editor/Gemfile.lock
@@ -204,4 +204,4 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4
diff --git a/apps/myjobs/Gemfile.lock b/apps/myjobs/Gemfile.lock
@@ -244,4 +244,4 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4
diff --git a/nginx_stage/nginx_stage.gemspec b/nginx_stage/nginx_stage.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "syslog", "~> 0.1.0"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 2.1.0"
   spec.add_development_dependency "rake", "~> 13.0.1"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "climate_control"

diff --git a/ood-portal-generator/Gemfile.lock b/ood-portal-generator/Gemfile.lock
@@ -42,4 +42,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.17.3
+   2.1.4
diff --git a/ood_auth_map/ood_auth_map.gemspec b/ood_auth_map/ood_auth_map.gemspec
@@ -18,6 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 2.1.0"
   spec.add_development_dependency "rake", "~> 13.0.1"
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,4 +35,4 @@ DEPENDENCIES @@
       watir
     BUNDLED WITH
-.17.3
+.1.4