From dfdeb87bff79938e4a00a008bb6a4d8a62144d7a Mon Sep 17 00:00:00 2001 From: Koen Sengers Date: Mon, 28 Oct 2024 12:58:26 +0100 Subject: [PATCH] build: Update lockbox Update lockbox Update github action versions Add rails 7.2 support --- .github/workflows/ci.yml | 7 ++++--- gemfiles/rails_6_1.gemfile | 1 + gemfiles/rails_7_2.gemfile | 7 +++++++ keypairs.gemspec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 gemfiles/rails_7_2.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01b9e05..338da61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2 + ruby-version: 3.3 bundler-cache: true - name: Setup reviewdog @@ -26,17 +26,18 @@ jobs: fail-fast: false matrix: ruby: - - '3.0' - '3.1' - '3.2' + - '3.3' gemfile: - rails_6_1 - rails_7_0 - rails_7_1 + - rails_7_2 runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set BUNDLE_GEMFILE run: echo 'BUNDLE_GEMFILE=${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile' >> $GITHUB_ENV diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile index dd95a47..12cf89f 100644 --- a/gemfiles/rails_6_1.gemfile +++ b/gemfiles/rails_6_1.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "rails", "~> 6.1.0" +gem "lockbox", "< 2.0" gemspec path: "../" diff --git a/gemfiles/rails_7_2.gemfile b/gemfiles/rails_7_2.gemfile new file mode 100644 index 0000000..92cc2b2 --- /dev/null +++ b/gemfiles/rails_7_2.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 7.2.0" + +gemspec path: "../" diff --git a/keypairs.gemspec b/keypairs.gemspec index 3e46dad..cb5f475 100644 --- a/keypairs.gemspec +++ b/keypairs.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'actionpack', '>= 6.0', '< 8' # Depend on actionpack to share public keys spec.add_dependency 'activerecord', '>= 6.0', '< 8' # Depend on activerecord as ORM spec.add_dependency 'jwt', '~> 2.5' # Working with JSON Web Tokens - spec.add_dependency 'lockbox', '~> 1.3' # Encrypt and decrypt attributes + spec.add_dependency 'lockbox', '>= 1.3', '< 3.0' # Encrypt and decrypt attributes spec.add_development_dependency 'appraisal' # Test against multiple gem versions spec.add_development_dependency 'brakeman' # Static analysis security vulnerability scanner