Merge branch 'master' into ch138081

.github/workflows/gem_push_beta.yml

@@ -4,13 +4,12 @@ on: [pull_request]
 
 env:
   BUNDLER_ACCESS_TOKEN: ${{ secrets.TECH_OPS_ACCESS_TOKEN }}
+  BUNDLE_RUBYGEMS__PKG__GITHUB__COM: ${{ secrets.TECH_OPS_ACCESS_TOKEN }}
 
 jobs:
   build:
     name: Test + Build + Publish
     runs-on: ubuntu-20.04
-    env:
-      BUNDLER_ACCESS_TOKEN: ${{ secrets.TECH_OPS_ACCESS_TOKEN }}
 
     services:
       redis:
@@ -21,22 +20,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Ruby 3.2.4
+      - name: Set up Ruby
         uses: ruby/setup-ruby@v1
-
-      - name: Configure Gem Cache
-        uses: actions/cache@v2
         with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
+          bundler-cache: true
 
       - name: Setup Tests
-        run: |
-          gem install bundler:1.17.3
-          bundle config rubygems.pkg.github.com x-access-token:$BUNDLER_ACCESS_TOKEN
-          make setup
+        run: make setup
 
       - name: Test
         run: make test

.github/workflows/gem_push_master.yml

@@ -4,6 +4,10 @@ on:
   push:
     branches: [ master ]
 
+env:
+  BUNDLER_ACCESS_TOKEN: ${{ secrets.TECH_OPS_ACCESS_TOKEN }}
+  BUNDLE_RUBYGEMS__PKG__GITHUB__COM: ${{ secrets.TECH_OPS_ACCESS_TOKEN }}
+
 jobs:
   build:
     name: Build + Publish
@@ -12,8 +16,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Ruby 3.2.4
+      - name: Set up Ruby
         uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
 
       - name: Publish to GPR
         run: |

Gemfile.lock

@@ -1,24 +1,24 @@
 PATH
   remote: .
   specs:
-    bureaucrat-sc (4.0.0)
-      activesupport (~> 6.0.4)
+    bureaucrat-sc (3.1.1)
+      activesupport (>= 6.0.4, < 7.0)
       i18n
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.6.1)
+    activesupport (6.1.7.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    concurrent-ruby (1.2.3)
-    diff-lcs (1.5.1)
-    i18n (1.14.4)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.3.3)
+    diff-lcs (1.3)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.22.3)
+    minitest (5.24.1)
     rake (12.0.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
@@ -33,10 +33,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
-    zeitwerk (2.6.13)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   ruby
@@ -47,4 +46,4 @@ DEPENDENCIES
   rspec (= 3.6.0)
 
 BUNDLED WITH
-   2.4.19
+   2.5.19

bureaucrat-sc.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.metadata    = { "github_repo" => "ssh://github.com/sittercity/bureaucrat" }
 
   s.add_runtime_dependency 'i18n'
-  s.add_runtime_dependency 'activesupport', '~> 6.0.4'
+  s.add_runtime_dependency 'activesupport', '>= 6.0.4', '< 7.0'
 
   s.add_development_dependency 'rake',  '12.0.0'
   s.add_development_dependency 'rspec', '3.6.0'

lib/bureaucrat/version.rb

@@ -1,3 +1,3 @@
 module Bureaucrat
-  VERSION = '4.0.0'
+  VERSION = '3.1.1'
 end