Skip to content

Commit

Permalink
Merge branch 'master' into feat/state_constants
Browse files Browse the repository at this point in the history
  • Loading branch information
stephenbinns committed Jan 11, 2024
2 parents 751dd46 + 20f4fd8 commit 872cbc3
Show file tree
Hide file tree
Showing 39 changed files with 671 additions and 286 deletions.
28 changes: 17 additions & 11 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,18 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby-version: ["2.7", "3.0", "3.1", "3.2"]
ruby-version: ["3.0", "3.1", "3.2", "3.3"]
rails-version:
- "6.1.5"
- "7.0.4"
- "6.1.7.6"
- "7.0.8"
- "7.1.1"
- "main"
postgres-version: ["9.6", "11", "14"]
postgres-version: ["12", "13", "14", "15", "16"]
exclude:
- ruby-version: "3.2"
rails-version: "6.1.5"
rails-version: "6.1.7.6"
- ruby-version: "3.3"
rails-version: "6.1.7.6"
runs-on: ubuntu-latest
services:
postgres:
Expand Down Expand Up @@ -66,15 +69,18 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby-version: ["2.7", "3.0", "3.1", "3.2"]
ruby-version: ["3.0", "3.1", "3.2", "3.3"]
rails-version:
- "6.1.5"
- "7.0.4"
- "6.1.7.6"
- "7.0.8"
- "7.1.1"
- "main"
mysql-version: ["5.7", "8.0"]
mysql-version: ["8.0", "8.2"]
exclude:
- ruby-version: 3.2
rails-version: "6.1.5"
- ruby-version: "3.2"
rails-version: "6.1.7.6"
- ruby-version: "3.3"
rails-version: "6.1.7.6"
runs-on: ubuntu-latest
services:
mysql:
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ Gemfile.lock
# Used by RuboCop. Remote config files pulled in from inherit_from directive.
# .rubocop-https?--*

# Project-specific ignores
.rspec

# VSCode
.vscode

Expand Down
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--require spec_helper
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inherit_gem:
gc_ruboconfig: rubocop.yml

AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0
NewCops: enable

Metrics/AbcSize:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.0
3.3.0
Loading

0 comments on commit 872cbc3

Please sign in to comment.