diff --git a/.github/workflows/gem_push_beta.yml b/.github/workflows/gem_push_beta.yml index 76ff179..7faaa1c 100644 --- a/.github/workflows/gem_push_beta.yml +++ b/.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 2.7 + - 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 diff --git a/.github/workflows/gem_push_master.yml b/.github/workflows/gem_push_master.yml index 2f95080..eaec33e 100644 --- a/.github/workflows/gem_push_master.yml +++ b/.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 2.7 + - name: Set up Ruby uses: ruby/setup-ruby@v1 + with: + bundler-cache: true - name: Publish to GPR run: | diff --git a/.ruby-version b/.ruby-version index fbafd6b..351227f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.2 \ No newline at end of file +3.2.4 diff --git a/Gemfile.lock b/Gemfile.lock index e2c11a1..9f5dae3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - bureaucrat-sc (3.1.0) + bureaucrat-sc (3.1.1) activesupport (>= 6.0.4, < 7.0) i18n @@ -46,4 +46,4 @@ DEPENDENCIES rspec (= 3.6.0) BUNDLED WITH - 1.17.3 + 2.5.19 diff --git a/lib/bureaucrat/version.rb b/lib/bureaucrat/version.rb index 766ccd3..238e575 100644 --- a/lib/bureaucrat/version.rb +++ b/lib/bureaucrat/version.rb @@ -1,3 +1,3 @@ module Bureaucrat - VERSION = '3.1.0' + VERSION = '3.1.1' end