Merge pull request #3566 from DMPRoadmap/aaron/bump-ruby-v3.1.4

Bump Ruby to v3.1.4 and use `.ruby-version` in CI

Author: aaronskiba

.github/workflows/danger.yml

@@ -18,7 +18,6 @@ jobs:
     - name: 'Install Ruby'
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ env.RUBY_VERSION }}
 
     - name: 'Bundle Install'
       run: |

.github/workflows/mysql.yml

@@ -19,7 +19,6 @@ jobs:
     # Install Ruby and run bundler
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
         bundler-cache: true
 
     # Install Node

.github/workflows/postgres.yml

@@ -36,7 +36,6 @@ jobs:
     # Install Ruby and run bundler
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
         bundler-cache: true
 
     ## - run: echo 'NODE_OPTIONS="--openssl-legacy-provider"' >> $GITHUB_ENV

.github/workflows/rubocop.yml

@@ -13,7 +13,6 @@ jobs:
     # Install Ruby and run bundler
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
         bundler-cache: true
 
     # Run the Rubocop linter checks

.gitignore

@@ -1,6 +1,3 @@
-# Ignore rbenv files
-.ruby-version
-
 # Ignore bundler config
 /.bundle
 

.ruby-version

@@ -0,0 +1 @@
+3.1.4

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v5.0.2
+- Bump Ruby to v3.1.4 and use `.ruby-version` in CI [#3566](https://github.com/DMPRoadmap/roadmap/pull/3566)
+
 ## v5.0.1
 - Updated seeds.rb file for identifier_schemes to include context value and removed logo_url and idenitifier_prefix for Shibboleth (as it was causing issues with SSO). [#3525](https://github.com/DMPRoadmap/roadmap/pull/3525)
 - Adjustments to style of select tags and plan download layout [#3509](https://github.com/DMPRoadmap/roadmap/pull/3509)

Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ruby '>= 3.0'
+ruby '3.1.4'
 
 # ===========#
 # CORE RAILS #

Gemfile.lock

@@ -210,7 +210,8 @@ GEM
       faraday (>= 0.8)
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.1)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
     flag_shih_tzu (0.3.23)
     fog-aws (3.30.0)
       base64 (~> 0.2.0)
@@ -696,7 +697,7 @@ DEPENDENCIES
   yard-tomdoc
 
 RUBY VERSION
-   ruby 3.0.4p208
+   ruby 3.1.4p223
 
 BUNDLED WITH
    2.4.17

app/controllers/plans_controller.rb

@@ -193,7 +193,8 @@ def show
     @default_orgs = Org.default_orgs
     @all_ggs_grouped_by_org.each do |org, ggs|
       # @default_orgs and already selected guidance groups are important.
-      if (@default_orgs.include?(org) || (ggs & @selected_guidance_groups).any?) && !@important_ggs.include?([org, ggs])
+      if (@default_orgs.include?(org) || ggs.intersect?(@selected_guidance_groups)) && !@important_ggs.include?([org,
+                                                                                                                 ggs])
         @important_ggs << [org, ggs]
       end
     end