Skip to content

Commit 3405e6f

Browse files
committed
Compile with Ruby 3.2.5
1 parent 8899d9c commit 3405e6f

File tree

3 files changed

+40
-34
lines changed

3 files changed

+40
-34
lines changed

.github/workflows/verify.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,9 @@ jobs:
293293
fail-fast: false
294294
matrix:
295295
os:
296-
- macos-12
296+
- macos-13
297297
ruby:
298-
- 3.0.6
298+
- 3.2.5
299299

300300
name: ${{ matrix.os }}
301301
steps:
@@ -368,7 +368,7 @@ jobs:
368368
os:
369369
- windows-2022
370370
ruby:
371-
- 3.0.6
371+
- 3.2.5
372372

373373
name: ${{ matrix.os }}
374374
steps:
@@ -393,6 +393,12 @@ jobs:
393393
submodules: true
394394
path: metasploit-omnibus
395395

396+
- name: Update bundler version
397+
# Github actions with Ruby requires Bundler 2.2.18+
398+
# https://github.com/ruby/setup-ruby/tree/d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c#windows
399+
run: |
400+
(Get-Content metasploit-omnibus\Gemfile.lock).Replace(' 2.2.33', ' 2.5.10') | Set-Content metasploit-omnibus\Gemfile.lock
401+
396402
- name: Setup Ruby
397403
env:
398404
BUNDLE_FORCE_RUBY_PLATFORM: true
@@ -404,7 +410,7 @@ jobs:
404410
working-directory: metasploit-omnibus
405411
# Github actions with Ruby requires Bundler 2.2.18+
406412
# https://github.com/ruby/setup-ruby/tree/d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c#windows
407-
bundler: 2.2.33
413+
bundler: 2.5.10
408414

409415
# If you need to build a custom version of pcaprub:
410416
# - name: Checkout pcaprub

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.6
1+
3.2.5

Gemfile.lock

+29-29
Original file line numberDiff line numberDiff line change
@@ -21,66 +21,66 @@ GIT
2121
GEM
2222
remote: https://rubygems.org/
2323
specs:
24-
addressable (2.8.6)
25-
public_suffix (>= 2.0.2, < 6.0)
24+
addressable (2.8.7)
25+
public_suffix (>= 2.0.2, < 7.0)
2626
awesome_print (1.9.2)
2727
aws-eventstream (1.3.0)
28-
aws-partitions (1.916.0)
29-
aws-sdk-core (3.192.1)
28+
aws-partitions (1.1017.0)
29+
aws-sdk-core (3.214.0)
3030
aws-eventstream (~> 1, >= 1.3.0)
31-
aws-partitions (~> 1, >= 1.651.0)
32-
aws-sigv4 (~> 1.8)
31+
aws-partitions (~> 1, >= 1.992.0)
32+
aws-sigv4 (~> 1.9)
3333
jmespath (~> 1, >= 1.6.1)
34-
aws-sdk-kms (1.79.0)
35-
aws-sdk-core (~> 3, >= 3.191.0)
36-
aws-sigv4 (~> 1.1)
34+
aws-sdk-kms (1.96.0)
35+
aws-sdk-core (~> 3, >= 3.210.0)
36+
aws-sigv4 (~> 1.5)
3737
aws-sdk-s3 (1.116.0)
3838
aws-sdk-core (~> 3, >= 3.127.0)
3939
aws-sdk-kms (~> 1)
4040
aws-sigv4 (~> 1.4)
41-
aws-sigv4 (1.8.0)
41+
aws-sigv4 (1.10.1)
4242
aws-eventstream (~> 1, >= 1.0.2)
4343
byebug (11.1.3)
4444
chef-cleanroom (1.0.5)
45-
chef-config (18.4.12)
45+
chef-config (18.5.0)
4646
addressable
47-
chef-utils (= 18.4.12)
47+
chef-utils (= 18.5.0)
4848
fuzzyurl
4949
mixlib-config (>= 2.2.12, < 4.0)
5050
mixlib-shellout (>= 2.0, < 4.0)
5151
tomlrb (~> 1.2)
52-
chef-utils (18.4.12)
52+
chef-utils (18.5.0)
5353
concurrent-ruby
5454
citrus (3.0.2)
5555
coderay (1.1.3)
56-
concurrent-ruby (1.2.3)
56+
concurrent-ruby (1.3.4)
5757
contracts (0.16.1)
58-
ffi (1.16.3)
58+
ffi (1.17.0)
5959
ffi-yajl (2.6.0)
6060
libyajl2 (>= 1.2)
6161
fuzzyurl (0.9.0)
62-
iostruct (0.0.5)
62+
iostruct (0.2.0)
6363
ipaddress (0.8.3)
6464
jmespath (1.6.2)
65-
json (2.7.2)
65+
json (2.9.0)
6666
libyajl2 (2.1.0)
67-
license_scout (1.3.7)
67+
license_scout (1.3.15)
6868
ffi-yajl (~> 2.2)
6969
mixlib-shellout (>= 2.2, < 4.0)
7070
toml-rb (>= 1, < 3)
71-
method_source (1.0.0)
71+
method_source (1.1.0)
7272
mixlib-cli (2.1.8)
7373
mixlib-config (3.0.27)
7474
tomlrb
7575
mixlib-log (3.0.9)
76-
mixlib-shellout (3.2.7)
76+
mixlib-shellout (3.3.4)
7777
chef-utils
7878
mixlib-versioning (1.2.12)
79-
multipart-post (2.4.0)
79+
multipart-post (2.4.1)
8080
net-scp (4.0.0)
8181
net-ssh (>= 2.6.5, < 8.0.0)
82-
net-ssh (7.2.3)
83-
ohai (18.1.3)
82+
net-ssh (7.3.0)
83+
ohai (18.1.18)
8484
chef-config (>= 14.12, < 19)
8585
chef-utils (>= 16.0, < 19)
8686
ffi (~> 1.9)
@@ -93,7 +93,7 @@ GEM
9393
plist (~> 3.1)
9494
train-core
9595
wmi-lite (~> 1.0)
96-
pedump (0.6.7)
96+
pedump (0.6.10)
9797
awesome_print
9898
iostruct (>= 0.0.4)
9999
multipart-post (>= 2.0.0)
@@ -106,23 +106,23 @@ GEM
106106
pry-byebug (3.10.1)
107107
byebug (~> 11.0)
108108
pry (>= 0.13, < 0.15)
109-
public_suffix (5.0.5)
109+
public_suffix (6.0.1)
110110
rainbow (3.1.1)
111-
rexml (3.3.7)
111+
rexml (3.3.9)
112112
ruby-progressbar (1.13.0)
113-
thor (1.3.1)
113+
thor (1.3.2)
114114
toml-rb (2.2.0)
115115
citrus (~> 3.0, > 3.0)
116116
tomlrb (1.3.0)
117-
train-core (3.12.3)
117+
train-core (3.12.7)
118118
addressable (~> 2.5)
119119
ffi (!= 1.13.0)
120120
json (>= 1.8, < 3.0)
121121
mixlib-shellout (>= 2.0, < 4.0)
122122
net-scp (>= 1.2, < 5.0)
123123
net-ssh (>= 2.9, < 8.0)
124124
wmi-lite (1.0.7)
125-
zhexdump (0.1.0)
125+
zhexdump (0.2.0)
126126

127127
PLATFORMS
128128
ruby

0 commit comments

Comments
 (0)