Merge pull request #11 from blocknotes/support-for-ruby-3.0

Support for Ruby 3.0

Author: Mattia Roccoberton

.github/workflows/specs.yml

@@ -1,5 +1,5 @@
 ---
-name: Specs
+name: Specs Rails 6.0
 
 on:
   pull_request:
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         ruby: ['2.6', '2.7']
-        gemfile: ['rails60_activeadmin22_activeresource51', 'rails60_activeadmin_activeresource', 'rails61_activeadmin29_activeresource51', 'rails61_activeadmin_activeresource']
+        gemfile: ['rails60_activeadmin22_activeresource51', 'rails60_activeadmin_activeresource']
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile

.github/workflows/specs2.yml

@@ -0,0 +1,40 @@
+---
+name: Specs Rails 6.1
+
+on:
+  pull_request:
+    branches: [master]
+  push:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby: ['2.6', '2.7', '3.0']
+        gemfile: ['rails61_activeadmin29_activeresource51', 'rails61_activeadmin_activeresource']
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rspec --profile
+
+      - name: On failure, archive screenshots as artifacts
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: test-failed-screenshots
+          path: spec/dummy/tmp/screenshots

gemfiles/rails60_activeadmin22_activeresource51.gemfile.lock

@@ -337,4 +337,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.33
+   2.3.8

gemfiles/rails60_activeadmin_activeresource.gemfile.lock

@@ -65,10 +65,10 @@ GEM
     activerecord (6.0.4.6)
       activemodel (= 6.0.4.6)
       activesupport (= 6.0.4.6)
-    activeresource (5.1.1)
-      activemodel (>= 5.0, < 7)
+    activeresource (6.0.0)
+      activemodel (>= 6.0)
       activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 5.0, < 7)
+      activesupport (>= 6.0)
     activestorage (6.0.4.6)
       actionpack (= 6.0.4.6)
       activejob (= 6.0.4.6)
@@ -318,4 +318,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.33
+   2.3.8

gemfiles/rails61_activeadmin29_activeresource51.gemfile.lock

@@ -321,4 +321,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.33
+   2.3.8

gemfiles/rails61_activeadmin_activeresource.gemfile.lock

@@ -67,10 +67,10 @@ GEM
     activerecord (6.1.4.6)
       activemodel (= 6.1.4.6)
       activesupport (= 6.1.4.6)
-    activeresource (5.1.1)
-      activemodel (>= 5.0, < 7)
+    activeresource (6.0.0)
+      activemodel (>= 6.0)
       activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 5.0, < 7)
+      activesupport (>= 6.0)
     activestorage (6.1.4.6)
       actionpack (= 6.1.4.6)
       activejob (= 6.1.4.6)