Skip to content

Commit 22b3d87

Browse files
authored
Merge branch 'main' into dependabot/bundler/rubocop-1.80.1
2 parents a5422ca + f7ab3c5 commit 22b3d87

File tree

156 files changed

+6939
-261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+6939
-261
lines changed

.github/workflows/rubyonrails.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@ jobs:
1111
matrix:
1212
include:
1313
- ruby: '3.4.4'
14-
rails: '7.1.5.2'
14+
rails: '7.2.2.2'
1515
allowed_failure: false # ✅ required
16-
- ruby: '3.4.4'
17-
rails: '7.2.2.1'
18-
allowed_failure: false # ⚠️ allowed to fail
1916
- ruby: '3.4.4'
2017
rails: '8.0.2'
2118
allowed_failure: true # ⚠️ allowed to fail
@@ -52,18 +49,18 @@ jobs:
5249
with:
5350
ruby-version: ${{ matrix.ruby }}
5451

55-
# Run the automatic bundle-install only on 7.1.
52+
# Run the automatic bundle-install only on 7.2.
5653
# For 7.2 / 8.0 it just sets up Ruby *and* restores a cache layer
5754
# that we’ll reuse in the later manual install.
58-
bundler-cache: ${{ matrix.rails == '7.1.5.2' }}
55+
bundler-cache: ${{ matrix.rails == '7.2.2.2' }}
5956

6057
# One cache bucket per Rails version so they don’t clobber each other.
6158
cache-version: rails-${{ matrix.rails }}
6259

6360
# Updating Rails can legitimately blow up on the experimental tracks,
6461
# so we allow that *step* to error out without failing the job.
6562
- name: Update Rails & install gems
66-
if: matrix.rails != '7.1.5.2'
63+
if: matrix.rails != '7.2.2.2'
6764
id: update
6865
run: |
6966
# turn off deployment mode
@@ -75,21 +72,21 @@ jobs:
7572
continue-on-error: ${{ matrix.allowed_failure }}
7673

7774
- name: Prepare DB schema
78-
if: (matrix.rails == '7.1.5.2') || steps.update.outcome == 'success'
75+
if: (matrix.rails == '7.2.2.2') || steps.update.outcome == 'success'
7976
run: |
8077
rm -f spec/dummy/tmp/pids/server.pid
8178
bundle exec rake -f spec/dummy/Rakefile db:schema:load
8279
continue-on-error: ${{ matrix.allowed_failure }}
8380

8481
- name: Wait for Elasticsearch
85-
if: (matrix.rails == '7.1.5.2') || steps.update.outcome == 'success'
82+
if: (matrix.rails == '7.2.2.2') || steps.update.outcome == 'success'
8683
run: |
8784
echo "Waiting for Elasticsearch to be healthy..."
8885
curl -s "http://localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" || (echo "Elasticsearch not healthy" && exit 1)
8986
9087
9188
- name: Run RSpec
92-
if: (matrix.rails == '7.1.5.2') || steps.update.outcome == 'success'
89+
if: (matrix.rails == '7.2.2.2') || steps.update.outcome == 'success'
9390
env:
9491
RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
9592
run: |

AGENTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Instructions for GitHub Copilot and other automated contributors working in this
44

55
## Project
66
- Ruby: 3.4.4 (installed via rbenv in setup)
7-
- Rails: 7.1
7+
- Rails: 7.2
88
- Node: 20
99
- DB: PostgreSQL + PostGIS
1010
- Search: Elasticsearch 7.17.23

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ gem 'pundit-resources', '~> 1.1.4', github: 'better-together-org/pundit-resource
2727

2828
# Core Rails gem
2929
gem 'rack-protection'
30-
gem 'rails', ENV.fetch('RAILS_VERSION', '7.1.5.2')
30+
gem 'rails', ENV.fetch('RAILS_VERSION', '7.2.2.2')
3131

3232
# Redis for ActionCable and background jobs
3333
gem 'redis', '~> 5.4'
@@ -98,6 +98,8 @@ group :test do
9898
# Capybara for integration testing
9999
gem 'capybara', '>= 2.15'
100100
gem 'capybara-screenshot'
101+
# WebMock for stubbing external HTTP requests in specs
102+
gem 'webmock'
101103
# Coveralls for test coverage reporting
102104
gem 'coveralls_reborn', require: false
103105
# Database cleaner for test database cleaning

0 commit comments

Comments
 (0)