Merge branch 'master' into patch-1

RolifyCommunity · Oct 18, 2023 · ad570f3 · ad570f3
2 parents 27cb176 + 55261dc
commit ad570f3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/activerecord.yml b/.github/workflows/activerecord.yml
@@ -7,8 +7,10 @@ jobs:
     strategy:
       matrix:
         gemfile: [activerecord_4, activerecord_5, activerecord_6]
-        ruby: [2.5.7, 2.6.5, 2.7.2]
+        ruby: [2.5.9, 2.6.10, 2.7.7]
         include:
+          - gemfile: activerecord_7
+            ruby: '3.2'
           - gemfile: activerecord_7
             ruby: '3.1'
           - gemfile: activerecord_7
@@ -19,16 +21,13 @@ jobs:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
       ADAPTER: active_record
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - run: sudo apt-get install -y libsqlite3-dev
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: sudo apt-get install -y libsqlite3-dev
-      - run: gem update --system
-      - run: gem install bundler
-      - run: gem --version
-      - run: bundle install
+          bundler-cache: true
       - name: Run Tests
         run: |
           bundle exec rake
diff --git a/.github/workflows/mongoid.yml b/.github/workflows/mongoid.yml
@@ -12,21 +12,18 @@ jobs:
     strategy:
       matrix:
         gemfile: [mongoid_5]
-        ruby: [2.5.7, 2.6.5, 2.7.2]
+        ruby: [2.5.9, 2.6.10, 2.7.7]
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
       ADAPTER: mongoid
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - run: sudo apt-get install -y libsqlite3-dev
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - run: sudo apt-get install -y libsqlite3-dev
-      - run: gem update --system
-      - run: gem install bundler
-      - run: gem --version
-      - run: bundle install
+          bundler-cache: true
       - name: Run Tests
         run: |
           bundle exec rake
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -1,3 +1,7 @@
+== 6.0.1
+
+* Fix with_role with :any resource
+
 = 6.0.0 (April 2, 2021)
 
 Breaking changes:

diff --git a/lib/rolify/version.rb b/lib/rolify/version.rb
@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "6.0.0"
+  VERSION = "6.0.1"
 end