diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 74b824c..f6f6aec 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,9 @@ name: Tests on: [push, pull_request] +permissions: + contents: read + jobs: test-27-plus: runs-on: ubuntu-latest @@ -9,21 +12,64 @@ jobs: strategy: matrix: ruby: - - head + - "3.3" + - "3.2" + - "3.1" - "3.0" - "2.7" gemfile: - - gemfiles/ar50.gemfile - - gemfiles/ar51.gemfile - - gemfiles/ar52.gemfile - - gemfiles/ar60.gemfile - - gemfiles/ar61.gemfile + - gemfiles/ar72.gemfile + - gemfiles/ar71.gemfile - gemfiles/ar70.gemfile - - gemfiles/rgeo1.gemfile - gemfiles/rgeo3.gemfile + - gemfiles/rgeo1.gemfile + channel: ['stable'] + include: + # Test legacy AR 5.x/6.x series + - ruby: '2.7' + gemfile: gemfiles/ar50.gemfile + channel: 'stable' + - ruby: '2.7' + gemfile: gemfiles/ar51.gemfile + channel: 'stable' + - ruby: '2.7' + gemfile: gemfiles/ar52.gemfile + channel: 'stable' + - ruby: '2.7' + gemfile: gemfiles/ar60.gemfile + channel: 'stable' + - ruby: '2.7' + gemfile: gemfiles/ar61.gemfile + channel: 'stable' + - ruby: '3.0' + gemfile: gemfiles/ar60.gemfile + channel: 'stable' + - ruby: '3.0' + gemfile: gemfiles/ar61.gemfile + channel: 'stable' + - ruby: '3.1' + gemfile: gemfiles/ar61.gemfile + channel: 'stable' + # Test against Ruby head + - ruby: head + gemfile: gemfiles/ar71.gemfile + channel: 'experimental' + - ruby: head + gemfile: gemfiles/rgeo3.gemfile + channel: 'experimental' + exclude: + - ruby: '2.7' + gemfile: gemfiles/ar72.gemfile + - ruby: '2.7' + gemfile: gemfiles/rgeo3.gemfile + - ruby: '3.0' + gemfile: gemfiles/ar72.gemfile + - ruby: '3.0' + gemfile: gemfiles/rgeo3.gemfile + continue-on-error: ${{ matrix.channel != 'stable' }} steps: - name: Set Up Gems - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set Up Deps run: sudo apt-get install libgeos-dev - name: Set Up Ruby @@ -51,7 +97,7 @@ jobs: - gemfiles/rgeo1.gemfile steps: - name: Set Up Gems - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set Up Deps run: sudo apt-get install libgeos-dev - name: Set Up Ruby diff --git a/Appraisals b/Appraisals index d74e0d3..cf44c0f 100644 --- a/Appraisals +++ b/Appraisals @@ -11,7 +11,7 @@ appraise "ar52" do end appraise "ar60" do - gem "activerecord", "~> 6.0.0.rc1" + gem "activerecord", "~> 6.0.0" end appraise "ar61" do @@ -22,9 +22,17 @@ appraise "ar70" do gem "activerecord", "~> 7.0.0" end +appraise "ar71" do + gem "activerecord", "~> 7.1.0" +end + +appraise "ar72" do + gem "activerecord", "~> 7.2.0" +end + appraise "rgeo3" do - gem "activerecord", "~> 7.0.0" - gem "rgeo", "~> 3.0.0" + gem "activerecord", "~> 7.2.0" + gem "rgeo", "~> 3.0" end appraise "rgeo1" do diff --git a/gemfiles/ar60.gemfile b/gemfiles/ar60.gemfile index b52583e..b07bd13 100644 --- a/gemfiles/ar60.gemfile +++ b/gemfiles/ar60.gemfile @@ -2,6 +2,6 @@ source "https://rubygems.org" -gem "activerecord", "~> 6.0.0.rc1" +gem "activerecord", "~> 6.0.0" gemspec path: "../" diff --git a/gemfiles/ar71.gemfile b/gemfiles/ar71.gemfile new file mode 100644 index 0000000..69bc38a --- /dev/null +++ b/gemfiles/ar71.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activerecord", "~> 7.1.0" + +gemspec path: "../" diff --git a/gemfiles/ar72.gemfile b/gemfiles/ar72.gemfile new file mode 100644 index 0000000..9a0f1ea --- /dev/null +++ b/gemfiles/ar72.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activerecord", "~> 7.2.0" + +gemspec path: "../" diff --git a/gemfiles/rgeo3.gemfile b/gemfiles/rgeo3.gemfile index ef31265..cc3713d 100644 --- a/gemfiles/rgeo3.gemfile +++ b/gemfiles/rgeo3.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "activerecord", "~> 7.0.0" -gem "rgeo", "~> 3.0.0" +gem "activerecord", "~> 7.2.0" +gem "rgeo", "~> 3.0" gemspec path: "../"