Skip to content

Commit 9070531

Browse files
author
Brian J. Cardiff
authored
Upgrade omnibus (#46)
1 parent 4f02679 commit 9070531

File tree

4 files changed

+78
-51
lines changed

4 files changed

+78
-51
lines changed

darwin/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ The whole process is automated using a `Makefile`.
55

66
# Dependencies
77

8-
* Ruby 2.4.2 and `bundle install --binstubs` in `./omnibus`
8+
* Ruby 2.5.6 and `bundle install --binstubs` in `./omnibus`
99
* `pkgconfig`, `libtool` (Can be installed by `$ brew install pkgconfig libtool`)
1010
* Own `/opt/crystal`, `/var/cache`.
1111

omnibus/.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.2
1+
2.5.6

omnibus/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ git_source(:github) do |repo_name|
55
"https://github.com/#{repo_name}.git"
66
end
77

8-
gem 'omnibus', '~> 5.5.0'
9-
gem 'omnibus-software', github: 'chef/omnibus-software', ref: '91d716b2f88127e0b1f742b98c63e18119498af3'
8+
gem 'omnibus', '~> 6.1.4'
9+
gem 'omnibus-software', github: 'chef/omnibus-software', ref: 'ae2a2f1cae3e8d80197a1cac5311b910300a53ff'

omnibus/Gemfile.lock

Lines changed: 74 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,110 @@
11
GIT
22
remote: https://github.com/chef/omnibus-software.git
3-
revision: 91d716b2f88127e0b1f742b98c63e18119498af3
4-
ref: 91d716b2f88127e0b1f742b98c63e18119498af3
3+
revision: ae2a2f1cae3e8d80197a1cac5311b910300a53ff
4+
ref: ae2a2f1cae3e8d80197a1cac5311b910300a53ff
55
specs:
66
omnibus-software (4.0.0)
7-
chef-sugar (>= 3.4.0)
8-
omnibus (>= 5.5.0)
7+
chef-sugar-ng (>= 5.0.0)
8+
omnibus (>= 5.6.1)
99

1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
addressable (2.5.1)
14-
public_suffix (~> 2.0, >= 2.0.2)
15-
aws-sdk (2.9.5)
16-
aws-sdk-resources (= 2.9.5)
17-
aws-sdk-core (2.9.5)
18-
aws-sigv4 (~> 1.0)
13+
addressable (2.7.0)
14+
public_suffix (>= 2.0.2, < 5.0)
15+
awesome_print (1.8.0)
16+
aws-eventstream (1.0.3)
17+
aws-partitions (1.216.0)
18+
aws-sdk-core (3.68.0)
19+
aws-eventstream (~> 1.0, >= 1.0.2)
20+
aws-partitions (~> 1.0)
21+
aws-sigv4 (~> 1.1)
1922
jmespath (~> 1.0)
20-
aws-sdk-resources (2.9.5)
21-
aws-sdk-core (= 2.9.5)
22-
aws-sigv4 (1.0.0)
23-
chef-config (12.19.36)
23+
aws-sdk-kms (1.24.0)
24+
aws-sdk-core (~> 3, >= 3.61.1)
25+
aws-sigv4 (~> 1.1)
26+
aws-sdk-s3 (1.48.0)
27+
aws-sdk-core (~> 3, >= 3.61.1)
28+
aws-sdk-kms (~> 1)
29+
aws-sigv4 (~> 1.1)
30+
aws-sigv4 (1.1.0)
31+
aws-eventstream (~> 1.0, >= 1.0.2)
32+
chef-cleanroom (1.0.2)
33+
chef-config (15.3.14)
2434
addressable
2535
fuzzyurl
26-
mixlib-config (~> 2.0)
27-
mixlib-shellout (~> 2.0)
28-
chef-sugar (3.4.0)
29-
cleanroom (1.0.0)
30-
ffi (1.9.18)
31-
ffi-yajl (2.3.0)
36+
mixlib-config (>= 2.2.12, < 4.0)
37+
mixlib-shellout (>= 2.0, < 4.0)
38+
tomlrb (~> 1.2)
39+
chef-sugar-ng (5.0.4)
40+
citrus (3.0.2)
41+
ffi (1.11.1)
42+
ffi-yajl (2.3.1)
3243
libyajl2 (~> 1.2)
3344
fuzzyurl (0.9.0)
45+
iostruct (0.0.4)
3446
ipaddress (0.8.3)
35-
jmespath (1.3.1)
47+
jmespath (1.4.0)
3648
libyajl2 (1.2.0)
37-
license_scout (0.1.3)
49+
license_scout (1.0.24)
3850
ffi-yajl (~> 2.2)
3951
mixlib-shellout (~> 2.2)
40-
mixlib-cli (1.7.0)
41-
mixlib-config (2.2.4)
42-
mixlib-log (1.7.1)
43-
mixlib-shellout (2.2.7)
44-
mixlib-versioning (1.1.0)
45-
ohai (8.23.0)
46-
chef-config (>= 12.5.0.alpha.1, < 13)
52+
toml-rb (~> 1.0)
53+
mixlib-cli (2.1.1)
54+
mixlib-config (3.0.1)
55+
tomlrb
56+
mixlib-log (3.0.1)
57+
mixlib-shellout (2.4.4)
58+
mixlib-versioning (1.2.7)
59+
multipart-post (2.0.0)
60+
ohai (15.3.1)
61+
chef-config (>= 12.8, < 16)
4762
ffi (~> 1.9)
4863
ffi-yajl (~> 2.2)
4964
ipaddress
50-
mixlib-cli
51-
mixlib-config (~> 2.0)
52-
mixlib-log (>= 1.7.1, < 2.0)
53-
mixlib-shellout (~> 2.0)
65+
mixlib-cli (>= 1.7.0)
66+
mixlib-config (>= 2.0, < 4.0)
67+
mixlib-log (>= 2.0.1, < 4.0)
68+
mixlib-shellout (>= 2.0, < 4.0)
5469
plist (~> 3.1)
5570
systemu (~> 2.6.4)
5671
wmi-lite (~> 1.0)
57-
omnibus (5.5.0)
58-
aws-sdk (~> 2)
59-
chef-sugar (~> 3.3)
60-
cleanroom (~> 1.0)
72+
omnibus (6.1.4)
73+
aws-sdk-s3 (~> 1)
74+
chef-cleanroom (~> 1.0)
75+
chef-sugar-ng (>= 3.3)
6176
ffi-yajl (~> 2.2)
62-
license_scout
63-
mixlib-shellout (~> 2.0)
77+
license_scout (~> 1.0)
78+
mixlib-shellout (>= 2.0, < 4.0)
6479
mixlib-versioning
65-
ohai (~> 8.0)
80+
ohai (>= 13, < 16)
81+
pedump
6682
ruby-progressbar (~> 1.7)
6783
thor (~> 0.18)
68-
plist (3.2.0)
69-
public_suffix (2.0.5)
70-
ruby-progressbar (1.8.1)
84+
pedump (0.5.2)
85+
awesome_print
86+
iostruct (>= 0.0.4)
87+
multipart-post (~> 2.0.0)
88+
progressbar
89+
zhexdump (>= 0.0.2)
90+
plist (3.5.0)
91+
progressbar (1.10.1)
92+
public_suffix (4.0.1)
93+
ruby-progressbar (1.10.1)
7194
systemu (2.6.5)
72-
thor (0.19.4)
73-
wmi-lite (1.0.0)
95+
thor (0.20.3)
96+
toml-rb (1.1.2)
97+
citrus (~> 3.0, > 3.0)
98+
tomlrb (1.2.8)
99+
wmi-lite (1.0.2)
100+
zhexdump (0.0.2)
74101

75102
PLATFORMS
76103
ruby
77104

78105
DEPENDENCIES
79-
omnibus (~> 5.5.0)
106+
omnibus (~> 6.1.4)
80107
omnibus-software!
81108

82109
BUNDLED WITH
83-
1.14.4
110+
1.17.3

0 commit comments

Comments
 (0)