Skip to content

Commit a6ebcac

Browse files
aaronskibaaaronskiba
authored
Merge pull request #3570 from DMPRoadmap/next-release/v5.0.2
Merge `next-release/v5.0.2` into `main`
2 parents bfbb518 + fb48734 commit a6ebcac

File tree

16 files changed

+129
-119
lines changed

16 files changed

+129
-119
lines changed

‎.github/workflows/brakeman.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
name: Brakeman
22

33
on:
4-
pull_request:
4+
push:
55
branches:
6-
master
6+
- main
7+
- next-release/*
78

89
jobs:
910
brakeman:
10-
1111
runs-on: ubuntu-24.04
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v2
1515

16-
# Will run Brakeman checks on dependencies
17-
# https://github.com/marketplace/actions/brakeman-action
18-
- name: Brakeman
19-
uses: artplan1/[email protected]
20-
with:
21-
flags: "--color"
22-
env:
23-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16+
# Will run Brakeman checks on dependencies
17+
# https://github.com/marketplace/actions/brakeman-action
18+
- name: Brakeman
19+
uses: artplan1/[email protected]
20+
with:
21+
flags: "--color"
22+
env:
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/danger.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
- name: 'Install Ruby'
1919
uses: ruby/setup-ruby@v1
2020
with:
21-
ruby-version: ${{ env.RUBY_VERSION }}
2221

2322
- name: 'Bundle Install'
2423
run: |

‎.github/workflows/mysql.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
# Install Ruby and run bundler
2020
- uses: ruby/setup-ruby@v1
2121
with:
22-
ruby-version: '3.0'
2322
bundler-cache: true
2423

2524
# Install Node

‎.github/workflows/postgres.yml‎

Lines changed: 85 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Tests - PostgreSQL
22

3-
on: [pull_request]
3+
on: [push, pull_request]
44

55
jobs:
66
postgresql:
@@ -16,7 +16,7 @@ jobs:
1616
# variable to bypass this changes:
1717
# https://github.com/docker-library/postgres/issues/681
1818
POSTGRES_HOST_AUTH_METHOD: trust
19-
ports: ['5432:5432']
19+
ports: ["5432:5432"]
2020
options: >-
2121
--health-cmd pg_isready
2222
--health-interval 10s
@@ -30,87 +30,86 @@ jobs:
3030
DISABLE_SPRING: 1
3131

3232
steps:
33-
# Checkout the repo
34-
- uses: actions/checkout@v3
35-
36-
# Install Ruby and run bundler
37-
- uses: ruby/setup-ruby@v1
38-
with:
39-
ruby-version: '3.0'
40-
bundler-cache: true
41-
42-
## - run: echo 'NODE_OPTIONS="--openssl-legacy-provider"' >> $GITHUB_ENV
43-
## /home/runner/runners/2.301.1/externals/node12/bin/node: --openssl-legacy-provider is not allowed in NODE_OPTIONS
44-
45-
# Install Node
46-
- uses: actions/setup-node@v3
47-
with:
48-
node-version: 18
49-
cache: 'yarn'
50-
51-
# Install the Postgres developer packages
52-
- name: 'Install Postgresql Packages'
53-
run: |
54-
sudo apt-get update
55-
sudo apt-get install libpq-dev
56-
57-
# Install ImageMagick (for `identify` command)
58-
- name: 'Install ImageMagick'
59-
run: |
60-
sudo apt-get install -y imagemagick
61-
62-
# Copy all of the example configs over
63-
- name: 'Setup Default Configuration'
64-
run: |
65-
cp config/database.yml.sample config/database.yml
66-
cp config/initializers/contact_us.rb.example config/initializers/contact_us.rb
67-
cp config/initializers/wicked_pdf.rb.example config/initializers/wicked_pdf.rb
68-
cp .env.postgresql .env
69-
70-
# Stub out the Rails credentials file so that we can start the Rails app
71-
- name: 'Setup Credentials'
72-
run: |
73-
# generate a default credential file and key
74-
EDITOR="sh -c 'echo \"$(cat config/credentials.yml.postgresql)\" > \$1' --" bundle exec rails credentials:edit
75-
76-
# Set the path to the wkhtmltopdf executable
77-
- name: 'Determine wkhtmltopdf location'
78-
run: echo "WICKED_PDF_PATH=`bundle exec which wkhtmltopdf`" >> $GITHUB_ENV
79-
80-
# Run yarn install for JS dependencies
81-
- name: 'Yarn Install'
82-
run: |
83-
yarn install
84-
85-
# TEMPORARY WORKAROUND FOR THE FOLLOWING ISSUE: https://github.com/DMPRoadmap/roadmap/issues/3485
86-
# Remove this once our tests are compatible with the new version of Chrome
87-
# Source: https://github.com/teamcapybara/capybara/issues/2800#issuecomment-2731100953
88-
- name: Remove image-bundled Chrome
89-
run: sudo apt-get purge google-chrome-stable
90-
- name: Setup stable Chrome
91-
uses: browser-actions/setup-chrome@v1
92-
with:
93-
chrome-version: 128
94-
install-chromedriver: true
95-
install-dependencies: true
96-
97-
# Initialize the DB
98-
- name: 'Setup Test DB'
99-
run: |
100-
bundle exec rails db:setup
101-
bundle exec rails db:migrate
102-
103-
# Prebuild the CSS, JS and image assets
104-
- name: 'Compile Assets'
105-
run: bundle exec rails assets:precompile
106-
107-
# Run the unit and functional tests
108-
- name: 'Run Rspec Unit and Functional Tests'
109-
run: |
110-
bundle exec rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
111-
bundle exec rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
112-
bundle exec rspec spec/mixins/
113-
114-
# Run the time consuming integration tests (using Chrome headless browser)
115-
- name: 'Run Integration Tests'
116-
run: bundle exec rspec spec/features/
33+
# Checkout the repo
34+
- uses: actions/checkout@v3
35+
36+
# Install Ruby and run bundler
37+
- uses: ruby/setup-ruby@v1
38+
with:
39+
bundler-cache: true
40+
41+
## - run: echo 'NODE_OPTIONS="--openssl-legacy-provider"' >> $GITHUB_ENV
42+
## /home/runner/runners/2.301.1/externals/node12/bin/node: --openssl-legacy-provider is not allowed in NODE_OPTIONS
43+
44+
# Install Node
45+
- uses: actions/setup-node@v3
46+
with:
47+
node-version: 18
48+
cache: "yarn"
49+
50+
# Install the Postgres developer packages
51+
- name: "Install Postgresql Packages"
52+
run: |
53+
sudo apt-get update
54+
sudo apt-get install libpq-dev
55+
56+
# Install ImageMagick (for `identify` command)
57+
- name: "Install ImageMagick"
58+
run: |
59+
sudo apt-get install -y imagemagick
60+
61+
# Copy all of the example configs over
62+
- name: "Setup Default Configuration"
63+
run: |
64+
cp config/database.yml.sample config/database.yml
65+
cp config/initializers/contact_us.rb.example config/initializers/contact_us.rb
66+
cp config/initializers/wicked_pdf.rb.example config/initializers/wicked_pdf.rb
67+
cp .env.postgresql .env
68+
69+
# Stub out the Rails credentials file so that we can start the Rails app
70+
- name: "Setup Credentials"
71+
run: |
72+
# generate a default credential file and key
73+
EDITOR="sh -c 'echo \"$(cat config/credentials.yml.postgresql)\" > \$1' --" bundle exec rails credentials:edit
74+
75+
# Set the path to the wkhtmltopdf executable
76+
- name: "Determine wkhtmltopdf location"
77+
run: echo "WICKED_PDF_PATH=`bundle exec which wkhtmltopdf`" >> $GITHUB_ENV
78+
79+
# Run yarn install for JS dependencies
80+
- name: "Yarn Install"
81+
run: |
82+
yarn install
83+
84+
# TEMPORARY WORKAROUND FOR THE FOLLOWING ISSUE: https://github.com/DMPRoadmap/roadmap/issues/3485
85+
# Remove this once our tests are compatible with the new version of Chrome
86+
# Source: https://github.com/teamcapybara/capybara/issues/2800#issuecomment-2731100953
87+
- name: Remove image-bundled Chrome
88+
run: sudo apt-get purge google-chrome-stable
89+
- name: Setup stable Chrome
90+
uses: browser-actions/setup-chrome@v1
91+
with:
92+
chrome-version: 128
93+
install-chromedriver: true
94+
install-dependencies: true
95+
96+
# Initialize the DB
97+
- name: "Setup Test DB"
98+
run: |
99+
bundle exec rails db:setup
100+
bundle exec rails db:migrate
101+
102+
# Prebuild the CSS, JS and image assets
103+
- name: "Compile Assets"
104+
run: bundle exec rails assets:precompile
105+
106+
# Run the unit and functional tests
107+
- name: "Run Rspec Unit and Functional Tests"
108+
run: |
109+
bundle exec rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
110+
bundle exec rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
111+
bundle exec rspec spec/mixins/
112+
113+
# Run the time consuming integration tests (using Chrome headless browser)
114+
- name: "Run Integration Tests"
115+
run: bundle exec rspec spec/features/

‎.github/workflows/rubocop.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ jobs:
1313
# Install Ruby and run bundler
1414
- uses: ruby/setup-ruby@v1
1515
with:
16-
ruby-version: '3.0'
1716
bundler-cache: true
1817

1918
# Run the Rubocop linter checks

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# Ignore rbenv files
2-
.ruby-version
3-
41
# Ignore bundler config
52
/.bundle
63

‎.ruby-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.1.4

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## v5.0.2
4+
- Bump Ruby to v3.1.4 and use `.ruby-version` in CI [#3566](https://github.com/DMPRoadmap/roadmap/pull/3566)
5+
- Enable session timeout after 90 minutes of inactivity [#3568](https://github.com/DMPRoadmap/roadmap/pull/3568)
6+
- Validate CSV Separator [#3569](https://github.com/DMPRoadmap/roadmap/pull/3569)
7+
- Fix rendering of `confirm_merge` partial [#3567](https://github.com/DMPRoadmap/roadmap/pull/3567)
8+
- Improve CI configuration [#3551](https://github.com/DMPRoadmap/roadmap/issues/3551)
9+
310
## v5.0.1
411
- 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)
512
- Adjustments to style of select tags and plan download layout [#3509](https://github.com/DMPRoadmap/roadmap/pull/3509)

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source 'https://rubygems.org'
44

5-
ruby '>= 3.0'
5+
ruby '3.1.4'
66

77
# ===========#
88
# CORE RAILS #

‎Gemfile.lock‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@ GEM
210210
faraday (>= 0.8)
211211
faraday-net_http (3.4.0)
212212
net-http (>= 0.5.0)
213-
ffi (1.17.1)
213+
ffi (1.17.1-arm64-darwin)
214+
ffi (1.17.1-x86_64-linux-gnu)
214215
flag_shih_tzu (0.3.23)
215216
fog-aws (3.30.0)
216217
base64 (~> 0.2.0)
@@ -696,7 +697,7 @@ DEPENDENCIES
696697
yard-tomdoc
697698

698699
RUBY VERSION
699-
ruby 3.0.4p208
700+
ruby 3.1.4p223
700701

701702
BUNDLED WITH
702703
2.4.17

0 commit comments

Comments
 (0)