Skip to content

Commit 2f23537

Browse files
authored
Merge pull request #331 from rails-on-services/development
Release v3.3.0
2 parents 2fb25d4 + f7945b5 commit 2f23537

File tree

104 files changed

+3000
-718
lines changed

Some content is hidden

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

104 files changed

+3000
-718
lines changed

.github/workflows/close-stale-issues.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/gem-publish.yml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,24 @@
11
name: Publish to RubyGems
2+
23
on:
34
push:
45
branches: [ 'main' ]
5-
paths:
6-
- 'lib/apartment/version.rb'
7-
pull_request:
8-
branches: [ 'main' ]
9-
types: [ 'closed' ]
10-
paths:
11-
- 'lib/apartment/version.rb'
126

137
jobs:
14-
build:
15-
if: github.event.pull_request.merged == true
8+
release:
169
name: Build + Publish
1710
runs-on: ubuntu-latest
1811
environment: production
1912
permissions:
20-
id-token: write
21-
contents: write
13+
id-token: write # Required for trusted publishing to RubyGems.org
14+
contents: write # Required for rake release to push the release tag
2215

2316
steps:
2417
- uses: actions/checkout@v4
25-
- uses: ruby/setup-ruby@v1
18+
- name: Set up Ruby
19+
uses: ruby/setup-ruby@v1
2620
with:
2721
bundler-cache: true
28-
rubygems: latest
29-
bundler: latest
22+
ruby-version: .ruby-version
3023
- name: Publish to RubyGems
3124
uses: rubygems/release-gem@v1

.github/workflows/rspec_mysql_8_0.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
- 3.4
2424
- jruby
2525
rails_version:
26-
- 6_1
2726
- 7_0
2827
- 7_1
2928
- 7_2
3029
- 8_0
30+
- 8_1
3131
exclude:
3232
- ruby_version: jruby
3333
rails_version: 7_1
@@ -37,6 +37,10 @@ jobs:
3737
rails_version: 8_0
3838
- ruby_version: 3.1
3939
rails_version: 8_0
40+
- ruby_version: jruby
41+
rails_version: 8_1
42+
- ruby_version: 3.1
43+
rails_version: 8_1
4044
env:
4145
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_mysql.gemfile
4246
CI: true

.github/workflows/rspec_pg_14.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
- 3.4
2424
- jruby
2525
rails_version:
26-
- 6_1
2726
- 7_0
2827
- 7_1
2928
- 7_2
3029
- 8_0
30+
- 8_1
3131
exclude:
3232
- ruby_version: jruby
3333
rails_version: 7_1
@@ -37,6 +37,11 @@ jobs:
3737
rails_version: 8_0
3838
- ruby_version: 3.1
3939
rails_version: 8_0
40+
- ruby_version: jruby
41+
rails_version: 8_1
42+
- ruby_version: 3.1
43+
rails_version: 8_1
44+
- ruby_version: 3.1
4045
env:
4146
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
4247
CI: true
@@ -102,4 +107,4 @@ jobs:
102107
file: ./coverage/test-results.xml
103108
- name: Notify of test failure
104109
if: steps.rspec-tests.outcome == 'failure'
105-
run: exit 1
110+
run: exit 1

.github/workflows/rspec_pg_15.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
- 3.4
2424
- jruby
2525
rails_version:
26-
- 6_1
2726
- 7_0
2827
- 7_1
2928
- 7_2
3029
- 8_0
30+
- 8_1
3131
exclude:
3232
- ruby_version: jruby
3333
rails_version: 7_1
@@ -37,6 +37,11 @@ jobs:
3737
rails_version: 8_0
3838
- ruby_version: 3.1
3939
rails_version: 8_0
40+
- ruby_version: jruby
41+
rails_version: 8_1
42+
- ruby_version: 3.1
43+
rails_version: 8_1
44+
- ruby_version: 3.1
4045
env:
4146
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
4247
CI: true
@@ -102,4 +107,4 @@ jobs:
102107
file: ./coverage/test-results.xml
103108
- name: Notify of test failure
104109
if: steps.rspec-tests.outcome == 'failure'
105-
run: exit 1
110+
run: exit 1

.github/workflows/rspec_pg_16.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ jobs:
2323
- 3.4
2424
- jruby
2525
rails_version:
26-
- 6_1
2726
- 7_0
2827
- 7_1
2928
- 7_2
29+
- 8_0
30+
- 8_1
3031
exclude:
3132
- ruby_version: jruby
3233
rails_version: 7_1
@@ -36,6 +37,11 @@ jobs:
3637
rails_version: 8_0
3738
- ruby_version: 3.1
3839
rails_version: 8_0
40+
- ruby_version: jruby
41+
rails_version: 8_1
42+
- ruby_version: 3.1
43+
rails_version: 8_1
44+
- ruby_version: 3.1
3945
env:
4046
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
4147
CI: true
@@ -101,4 +107,4 @@ jobs:
101107
file: ./coverage/test-results.xml
102108
- name: Notify of test failure
103109
if: steps.rspec-tests.outcome == 'failure'
104-
run: exit 1
110+
run: exit 1

.github/workflows/rspec_pg_17.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
- 3.4
2424
- jruby
2525
rails_version:
26-
- 6_1
2726
- 7_0
2827
- 7_1
2928
- 7_2
3029
- 8_0
30+
- 8_1
3131
exclude:
3232
- ruby_version: jruby
3333
rails_version: 7_1
@@ -37,6 +37,11 @@ jobs:
3737
rails_version: 8_0
3838
- ruby_version: 3.1
3939
rails_version: 8_0
40+
- ruby_version: jruby
41+
rails_version: 8_1
42+
- ruby_version: 3.1
43+
rails_version: 8_1
44+
- ruby_version: 3.1
4045
env:
4146
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
4247
CI: true
@@ -102,4 +107,4 @@ jobs:
102107
file: ./coverage/test-results.xml
103108
- name: Notify of test failure
104109
if: steps.rspec-tests.outcome == 'failure'
105-
run: exit 1
110+
run: exit 1

.github/workflows/rspec_pg_18.yml

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
name: RSpec PostgreSQL 18
2+
on:
3+
push:
4+
branches:
5+
- development
6+
- main
7+
pull_request:
8+
types: [opened, synchronize, reopened]
9+
release:
10+
types: [published]
11+
12+
jobs:
13+
test:
14+
name: ${{ github.workflow }}, Ruby ${{ matrix.ruby_version }}, Rails ${{ matrix.rails_version }}
15+
runs-on: ubuntu-latest
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
ruby_version:
20+
- 3.1
21+
- 3.2
22+
- 3.3
23+
- 3.4
24+
- jruby
25+
rails_version:
26+
- 7_0
27+
- 7_1
28+
- 7_2
29+
- 8_0
30+
- 8_1
31+
exclude:
32+
- ruby_version: jruby
33+
rails_version: 7_1
34+
- ruby_version: jruby
35+
rails_version: 7_2
36+
- ruby_version: jruby
37+
rails_version: 8_0
38+
- ruby_version: 3.1
39+
rails_version: 8_0
40+
- ruby_version: jruby
41+
rails_version: 8_1
42+
- ruby_version: 3.1
43+
rails_version: 8_1
44+
- ruby_version: 3.1
45+
env:
46+
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
47+
CI: true
48+
DATABASE_ENGINE: postgresql
49+
RUBY_VERSION: ${{ matrix.ruby_version }}
50+
RAILS_VERSION: ${{ matrix.rails_version }}
51+
services:
52+
postgres:
53+
image: postgres:18-alpine
54+
env:
55+
POSTGRES_PASSWORD: postgres
56+
POSTGRES_HOST_AUTH_METHOD: trust
57+
POSTGRES_DB: apartment_postgresql_test
58+
options: >-
59+
--health-cmd pg_isready
60+
--health-interval 10s
61+
--health-timeout 5s
62+
--health-retries 5
63+
ports:
64+
- 5432:5432
65+
steps:
66+
- name: Install PostgreSQL client
67+
run: |
68+
sudo apt-get update -qq
69+
sudo apt-get install -y --no-install-recommends postgresql-common
70+
echo | sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh
71+
sudo apt-get update -qq
72+
sudo apt-get install -y --no-install-recommends postgresql-client-18
73+
- uses: actions/checkout@v4
74+
- name: Set up Ruby ${{ matrix.ruby-version }}
75+
uses: ruby/setup-ruby@v1
76+
with:
77+
ruby-version: ${{ matrix.ruby_version }}
78+
bundler-cache: true
79+
- name: Configure config database.yml
80+
run: bundle exec rake db:load_credentials
81+
- name: Database Setup
82+
run: bundle exec rake db:test:prepare
83+
- name: Run tests
84+
id: rspec-tests
85+
timeout-minutes: 20
86+
continue-on-error: true
87+
run: |
88+
mkdir -p ./coverage
89+
bundle exec rspec --format progress \
90+
--format RspecJunitFormatter -o ./coverage/test-results.xml \
91+
--profile
92+
- name: Codecov Upload
93+
uses: codecov/codecov-action@v4
94+
with:
95+
token: ${{ secrets.CODECOV_TOKEN }}
96+
verbose: true
97+
disable_search: true
98+
env_vars: DATABASE_ENGINE, RUBY_VERSION, RAILS_VERSION
99+
file: ./coverage/coverage.json
100+
- name: Upload test results to Codecov
101+
uses: codecov/test-results-action@v1
102+
with:
103+
token: ${{ secrets.CODECOV_TOKEN }}
104+
verbose: true
105+
disable_search: true
106+
env_vars: DATABASE_ENGINE, RUBY_VERSION, RAILS_VERSION
107+
file: ./coverage/test-results.xml
108+
- name: Notify of test failure
109+
if: steps.rspec-tests.outcome == 'failure'
110+
run: exit 1

.github/workflows/rspec_sqlite_3.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,16 @@ jobs:
2323
- 3.4
2424
# - jruby # We don't support jruby for sqlite yet
2525
rails_version:
26-
- 6_1
2726
- 7_0
2827
- 7_1
2928
- 7_2
3029
- 8_0
30+
- 8_1
3131
exclude:
3232
- ruby_version: 3.1
3333
rails_version: 8_0
34-
# - ruby_version: jruby
35-
# rails_version: 7_1
36-
# - ruby_version: jruby
37-
# rails_version: 7_2
38-
# - ruby_version: jruby
39-
# rails_version: 8_0
34+
- ruby_version: 3.1
35+
rails_version: 8_1
4036
env:
4137
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_sqlite3.gemfile
4238
CI: true
@@ -81,4 +77,4 @@ jobs:
8177
file: ./coverage/test-results.xml
8278
- name: Notify of test failure
8379
if: steps.rspec-tests.outcome == 'failure'
84-
run: exit 1
80+
run: exit 1

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ cookbooks
1313
tmp
1414
spec/dummy/db/*.sqlite3
1515
.DS_Store
16+
.claude/

0 commit comments

Comments
 (0)