diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index a6206f0..89a17e3 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -9,51 +9,11 @@ on: - '*' jobs: - test: - runs-on: ${{ matrix.os }} - timeout-minutes: 40 - - strategy: - fail-fast: true - matrix: - ruby: - - '2.7' - - '3.0' - - '3.1' - - '3.2' - os: - - ubuntu-20.04 - - ubuntu-latest - exclude: - - { os: ubuntu-latest, ruby: '2.7' } - - { os: ubuntu-latest, ruby: '3.0' } - env: - RAILS_ENV: test - - name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }} - steps: - - name: Install system dependencies - run: sudo apt-get install graphviz - - - name: Checkout code - uses: actions/checkout@v2 - - - name: Setup Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - bundler-cache: true - - - name: Test - run: | - bundle exec rake spec - bundle exec rake cucumber - bundle exec rake yard - - - name: Upload coverage report - uses: actions/upload-artifact@v2 - with: - name: coverage-${{ matrix.ruby }} - path: | - coverage/ - retention-days: 1 + build: + uses: rapid7/metasploit-framework/.github/workflows/shared_gem_verify_rails.yml@master + with: + dependencies: '["graphviz"]' + test_commands: | + bundle exec rake spec + bundle exec rake cucumber + bundle exec rake yard diff --git a/Gemfile b/Gemfile index 959bb3d..6e8075b 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,10 @@ source 'https://rubygems.org' # development dependencies will be added by default to the :development group. gemspec +# Temporary, remove once the Rails 7.1 update is complete +# see: https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror +gem 'concurrent-ruby', '1.3.4' + group :development do # documentation gem 'yard' diff --git a/metasploit-concern.gemspec b/metasploit-concern.gemspec index 172adfa..3ac2493 100644 --- a/metasploit-concern.gemspec +++ b/metasploit-concern.gemspec @@ -31,4 +31,12 @@ Gem::Specification.new do |s| # for engine s.add_runtime_dependency 'railties', '~> 7.0' s.add_runtime_dependency 'zeitwerk' + + # Standard libraries: https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/ + %w[ + drb + mutex_m + ].each do |library| + s.add_runtime_dependency library + end end