From 6e65acca5cf86bb716eea598a3011a586eec1f94 Mon Sep 17 00:00:00 2001 From: aaronskiba Date: Thu, 2 Oct 2025 10:21:19 -0600 Subject: [PATCH 1/5] Set ruby '3.1.4' in Gemfile && `bundle install` --- Gemfile | 2 +- Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e66e5e7288..2a9aa8721d 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -ruby '>= 3.0' +ruby '3.1.4' # ===========# # CORE RAILS # diff --git a/Gemfile.lock b/Gemfile.lock index 9c399339bb..b123dadad1 100644 --- a/Gemfile.lock +++ b/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 From 76a5301a04268ace794b495c7f2928d6c3a8a0f4 Mon Sep 17 00:00:00 2001 From: aaronskiba Date: Thu, 2 Oct 2025 10:23:27 -0600 Subject: [PATCH 2/5] Remove `.ruby-version` from `.gitignore` --- .gitignore | 3 --- .ruby-version | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) create mode 100644 .ruby-version diff --git a/.gitignore b/.gitignore index 5943ad35e2..b32c4f2b28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -# Ignore rbenv files -.ruby-version - # Ignore bundler config /.bundle diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000000..0aec50e6ed --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +3.1.4 From 8b95198184178a48b9e9796b79169a2c09b23b9b Mon Sep 17 00:00:00 2001 From: aaronskiba Date: Thu, 2 Oct 2025 10:28:45 -0600 Subject: [PATCH 3/5] Use `.ruby-version` for Ruby version in CI Removed the hardcoded `ruby-version` from GitHub Actions workflows. - `ruby/setup-ruby` now reads the version from `.ruby-version`. - Avoids duplication and keeps CI consistent with local development --- .github/workflows/danger.yml | 1 - .github/workflows/mysql.yml | 1 - .github/workflows/postgres.yml | 1 - .github/workflows/rubocop.yml | 1 - 4 files changed, 4 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 8fbb6af429..41a7bf0bd0 100644 --- a/.github/workflows/danger.yml +++ b/.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: | diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml index 08a335329b..7c25271528 100644 --- a/.github/workflows/mysql.yml +++ b/.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 diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml index 517fd35954..c1e44af294 100644 --- a/.github/workflows/postgres.yml +++ b/.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 diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index dc92a01f4b..15c3fd9028 100644 --- a/.github/workflows/rubocop.yml +++ b/.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 From dc25eec413af3f7498a6e480445a243d3ba8c14f Mon Sep 17 00:00:00 2001 From: aaronskiba Date: Thu, 2 Oct 2025 10:21:27 -0600 Subject: [PATCH 4/5] `bundle exec rubocop -A` --- app/controllers/plans_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb index 8f7c44393a..c66bbfdeb4 100644 --- a/app/controllers/plans_controller.rb +++ b/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 From 3664410b63def606e549b49f1a83e513171b3220 Mon Sep 17 00:00:00 2001 From: aaronskiba Date: Mon, 6 Oct 2025 10:24:45 -0600 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0633ac0360..74281a792e 100644 --- a/CHANGELOG.md +++ b/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)