From 03cd9d694525c6172f07609aaa83712e3291f69d Mon Sep 17 00:00:00 2001 From: Peter Goldstein Date: Mon, 19 Sep 2022 09:47:04 -0400 Subject: [PATCH 1/4] Add Dependabot for GitHub Actions (#582) --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..5ace4600 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From 584d329d7d0281029e5185f70d3d0298d2122cea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 16:32:19 -0400 Subject: [PATCH 2/4] Bump actions/checkout from 2 to 3 (#585) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/activerecord.yml | 2 +- .github/workflows/mongoid.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/activerecord.yml b/.github/workflows/activerecord.yml index c49c6e29..4e81462a 100644 --- a/.github/workflows/activerecord.yml +++ b/.github/workflows/activerecord.yml @@ -19,7 +19,7 @@ jobs: BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile ADAPTER: active_record steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup ruby uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/mongoid.yml b/.github/workflows/mongoid.yml index 4ff61be1..a03a382b 100644 --- a/.github/workflows/mongoid.yml +++ b/.github/workflows/mongoid.yml @@ -17,7 +17,7 @@ jobs: BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile ADAPTER: mongoid steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup ruby uses: ruby/setup-ruby@v1 with: From daad1cdc3841f99e94a498b1cbfe332a20f738a6 Mon Sep 17 00:00:00 2001 From: Peter Goldstein Date: Thu, 2 Feb 2023 14:44:12 -0500 Subject: [PATCH 3/4] Adds Ruby 3.2 to the CI matrix (#588) * Adds Ruby 3.2 to the CI matrix * Use ruby/setup-ruby so the correct bundler is installed for the Ruby version. --- .github/workflows/activerecord.yml | 11 +++++------ .github/workflows/mongoid.yml | 9 +++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/activerecord.yml b/.github/workflows/activerecord.yml index 4e81462a..0e0bf764 100644 --- 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 @@ -20,15 +22,12 @@ jobs: ADAPTER: active_record steps: - 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 index a03a382b..654666e8 100644 --- 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@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 From 55261dcc26ae0bbca90a657e9449c65095924465 Mon Sep 17 00:00:00 2001 From: Thomas McDonald Date: Thu, 2 Feb 2023 19:50:46 +0000 Subject: [PATCH 4/4] prepare 6.0.1 release (#589) --- CHANGELOG.rdoc | 4 ++++ lib/rolify/version.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index 35a500db..64748bd1 100644 --- 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 index 86327cb3..939a12de 100644 --- 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