Skip to content

Commit 7161474

Browse files
committed
Updates verify workflow to use shared pipeline
1 parent 1c21957 commit 7161474

File tree

3 files changed

+20
-48
lines changed

3 files changed

+20
-48
lines changed

.github/workflows/verify.yml

Lines changed: 8 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,51 +9,11 @@ on:
99
- '*'
1010

1111
jobs:
12-
test:
13-
runs-on: ${{ matrix.os }}
14-
timeout-minutes: 40
15-
16-
strategy:
17-
fail-fast: true
18-
matrix:
19-
ruby:
20-
- '2.7'
21-
- '3.0'
22-
- '3.1'
23-
- '3.2'
24-
os:
25-
- ubuntu-20.04
26-
- ubuntu-latest
27-
exclude:
28-
- { os: ubuntu-latest, ruby: '2.7' }
29-
- { os: ubuntu-latest, ruby: '3.0' }
30-
env:
31-
RAILS_ENV: test
32-
33-
name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }}
34-
steps:
35-
- name: Install system dependencies
36-
run: sudo apt-get install graphviz
37-
38-
- name: Checkout code
39-
uses: actions/checkout@v2
40-
41-
- name: Setup Ruby
42-
uses: ruby/setup-ruby@v1
43-
with:
44-
ruby-version: ${{ matrix.ruby }}
45-
bundler-cache: true
46-
47-
- name: Test
48-
run: |
49-
bundle exec rake spec
50-
bundle exec rake cucumber
51-
bundle exec rake yard
52-
53-
- name: Upload coverage report
54-
uses: actions/upload-artifact@v2
55-
with:
56-
name: coverage-${{ matrix.ruby }}
57-
path: |
58-
coverage/
59-
retention-days: 1
12+
build:
13+
uses: rapid7/metasploit-framework/.github/workflows/shared_gem_verify_rails.yml@master
14+
with:
15+
dependencies: '["graphviz"]'
16+
test_commands: |
17+
bundle exec rake spec
18+
bundle exec rake cucumber
19+
bundle exec rake yard

Gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ source 'https://rubygems.org'
55
# development dependencies will be added by default to the :development group.
66
gemspec
77

8+
# Temporary, remove once the Rails 7.1 update is complete
9+
# see: https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror
10+
gem 'concurrent-ruby', '1.3.4'
11+
812
group :development do
913
# documentation
1014
gem 'yard'

metasploit-concern.gemspec

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,12 @@ Gem::Specification.new do |s|
3131
# for engine
3232
s.add_runtime_dependency 'railties', '~> 7.0'
3333
s.add_runtime_dependency 'zeitwerk'
34+
35+
# Standard libraries: https://www.ruby-lang.org/en/news/2023/12/25/ruby-3-3-0-released/
36+
%w[
37+
drb
38+
mutex_m
39+
].each do |library|
40+
s.add_runtime_dependency library
41+
end
3442
end

0 commit comments

Comments
 (0)