Skip to content

Commit def04c6

Browse files
committed
bump to 8.1
- update history - fix activerecord dependency in gemspec - bump version
1 parent 20fcd00 commit def04c6

File tree

8 files changed

+54
-41
lines changed

8 files changed

+54
-41
lines changed

.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[*.yml]
2+
indent_size = 2

.github/workflows/test.yml

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,30 @@
11
name: Tests
2-
on: [push, pull_request]
2+
on:
3+
push:
4+
branches: [master]
5+
# Triggers the workflow on pull request events.
6+
pull_request:
7+
types: [opened, reopened, synchronize]
8+
# Allows you to run this workflow manually from the Actions tab
9+
workflow_dispatch:
10+
11+
# This allows a subsequently queued workflow run to interrupt previous runs.
12+
concurrency:
13+
group: "${{ github.workflow }} @ ${{ github.ref }}"
14+
cancel-in-progress: true
315

416
permissions:
517
contents: read
618

719
jobs:
20+
test_results:
21+
name: Verify Stable Test Results
22+
needs: tests
23+
runs-on: ubuntu-latest
24+
steps:
25+
- name: Check stable test results
26+
run: |
27+
[[ "${{ needs.tests.outputs.stable_failed }}" == "1" ]]
828
tests:
929
runs-on: ubuntu-latest
1030
env:
@@ -17,31 +37,22 @@ jobs:
1737
- "3.2"
1838
- "jruby-9.4.14.0"
1939
gemfile:
20-
- gemfiles/ar81_beta.gemfile
21-
- gemfiles/ar80.gemfile
22-
- gemfiles/ar72.gemfile
23-
channel: ['stable']
40+
- gemfiles/ar81.gemfile
41+
channel: ["stable"]
2442
exclude:
2543
- ruby: "jruby-9.4.14.0"
26-
gemfile: gemfiles/ar81_beta.gemfile
27-
channel: 'stable'
28-
- ruby: "jruby-9.4.14.0"
29-
gemfile: gemfiles/ar80.gemfile
30-
channel: 'stable'
44+
gemfile: gemfiles/ar81.gemfile
45+
channel: "stable"
3146
include:
3247
- ruby: head
33-
gemfile: gemfiles/ar80.gemfile
34-
channel: 'experimental'
35-
- ruby: head
36-
gemfile: gemfiles/ar72.gemfile
37-
channel: 'experimental'
38-
- ruby: jruby-head
39-
gemfile: gemfiles/ar80.gemfile
40-
channel: 'experimental'
48+
gemfile: gemfiles/ar81.gemfile
49+
channel: "experimental"
4150
- ruby: jruby-head
42-
gemfile: gemfiles/ar72.gemfile
43-
channel: 'experimental'
51+
gemfile: gemfiles/ar81.gemfile
52+
channel: "experimental"
4453
continue-on-error: ${{ matrix.channel != 'stable' }}
54+
outputs:
55+
stable_failed: ${{ steps.mark_failure.outputs.failure }}
4556
steps:
4657
- name: Set Up Gems
4758
uses: actions/checkout@v4
@@ -54,3 +65,7 @@ jobs:
5465
bundler-cache: true
5566
- name: Test
5667
run: bundle exec rake
68+
- name: Mark failure
69+
id: mark_failure
70+
if: ${{ failure() && matrix.channel == 'stable' }}
71+
run: echo "failure=1" >> $GITHUB_OUTPUT

Appraisals

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ appraise "ar80" do
66
gem "activerecord", "~> 8.0.0"
77
end
88

9-
appraise "ar81-beta" do
10-
gem "activerecord", "~> 8.1.0.beta"
9+
appraise "ar81" do
10+
gem "activerecord", "~> 8.1.0"
1111
end

History.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### 9.0.0 / Unreleased
1+
### 8.1.0 / Unreleased
22

33
* Drop support for legacy dependencies (t27duck)
44
* Support ActiveRecord 8.0 and 8.1 beta (t27duck)

README.md

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,17 @@ Gemfile:
2929
gem 'rgeo-activerecord'
3030
```
3131

32-
Version `8.0+` supports ActiveRecord 7.x with `rgeo` 3.0+
33-
34-
Version `7.0+` supports ActiveRecord 5.x, 6.x, and 7.x with `rgeo` 1.0+
35-
36-
Version `6.2+` supports ActiveRecord 5.x and 6.x with `rgeo` 1.0+
37-
38-
Version `6.1` supports ActiveRecord 5.x and 6.0 with `rgeo` 1.0+.
39-
40-
Version `6.0` supports ActiveRecord 5.x with `rgeo` 1.x.
41-
42-
Version `5.0` supports ActiveRecord 5.0 and 5.1, with `rgeo` 0.6.
43-
44-
Version `4.0` supports ActiveRecord 4.2.
45-
46-
Version `1.1.0` supports ActiveRecord 4.0 and 4.1
32+
| Version | Supported ActiveRecord Versions | Supported rgeo Versions |
33+
| ------- | ------------------------------- | ----------------------- |
34+
| 8.1 | 8.1 | 3.0+ |
35+
| 8.0 | 7.x, 8.0 | 3.0+ |
36+
| 7.0+ | 5.x, 6.x, 7.x | 1.0+ |
37+
| 6.2+ | 5.x, 6.x | 1.0+ |
38+
| 6.1 | 5.x, 6.0 | 1.0+ |
39+
| 6.0 | 5.x | 1.x |
40+
| 5.0 | 5.0, 5.1 | 0.6 |
41+
| 4.0 | 4.2 | |
42+
| 1.1.0 | 4.0, 4.1 | |
4743

4844
Version `0.6.0` supports earlier versions of ruby and ActiveRecord:
4945

gemfiles/ar81_beta.gemfile renamed to gemfiles/ar81.gemfile

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

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

5-
gem "activerecord", "~> 8.1.0.beta"
5+
gem "activerecord", "~> 8.1.0"
66

77
gemspec path: "../"

lib/rgeo/active_record/version.rb

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

33
module RGeo
44
module ActiveRecord
5-
VERSION = "8.0.0"
5+
VERSION = "8.1.0"
66
end
77
end

rgeo-activerecord.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
1414

1515
spec.required_ruby_version = ">= 3.1.0"
1616

17-
spec.add_dependency "activerecord", ">= 7.0"
17+
spec.add_dependency "activerecord", ">= 8.1", "< 8.2"
1818
spec.add_dependency "rgeo", ">= 3.0"
1919

2020
spec.add_development_dependency "appraisal", "~> 2.1"

0 commit comments

Comments
 (0)