Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate macOS 10.12 and add macOS 10.15 support #455

Merged
merged 2 commits into from
Aug 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .expeditor/release.omnibus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ builder-to-testers-map:
el-7-x86_64:
- el-7-x86_64
- el-8-x86_64
mac_os_x-10.12-x86_64:
- mac_os_x-10.12-x86_64
mac_os_x-10.13-x86_64:
- mac_os_x-10.13-x86_64
- mac_os_x-10.14-x86_64
- mac_os_x-10.15-x86_64
ubuntu-16.04-x86_64:
- ubuntu-16.04-x86_64
- ubuntu-18.04-x86_64
Expand Down
36 changes: 18 additions & 18 deletions omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: 35e8a6187e07e91fa7040d8b050e8bc508c4261f
revision: 75f8868a794508d6b567162f13924c9d21ce5dfa
branch: master
specs:
omnibus-software (4.0.0)
Expand All @@ -9,10 +9,10 @@ GIT

GIT
remote: https://github.com/chef/omnibus.git
revision: 33bddeefb10afe23a57ea72807625881ab01990f
revision: c872e61c30d2b3f88ead03bd1254ff96d37059a3
branch: master
specs:
omnibus (6.1.0)
omnibus (6.1.3)
aws-sdk-s3 (~> 1)
chef-sugar (>= 3.3)
cleanroom (~> 1.0)
Expand All @@ -33,16 +33,16 @@ GEM
artifactory (3.0.5)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
aws-partitions (1.195.0)
aws-sdk-core (3.61.2)
aws-partitions (1.207.0)
aws-sdk-core (3.65.1)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.24.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.46.0)
aws-sdk-s3 (1.47.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
Expand All @@ -65,11 +65,11 @@ GEM
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.3)
chef (15.1.36)
chef (15.2.20)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
chef-config (= 15.1.36)
chef-config (= 15.2.20)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
Expand All @@ -95,11 +95,11 @@ GEM
train-core (~> 2.0, >= 2.0.12)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
chef (15.1.36-universal-mingw32)
chef (15.2.20-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
chef-config (= 15.1.36)
chef-config (= 15.2.20)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
Expand Down Expand Up @@ -137,7 +137,7 @@ GEM
win32-service (>= 2.1.2, < 3.0)
win32-taskscheduler (~> 2.0)
wmi-lite (~> 1.0)
chef-config (15.1.36)
chef-config (15.2.20)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
Expand Down Expand Up @@ -182,7 +182,7 @@ GEM
iso8601 (0.12.1)
jmespath (1.4.0)
json (2.2.0)
kitchen-vagrant (1.5.2)
kitchen-vagrant (1.6.0)
test-kitchen (>= 1.4, < 3)
libyajl2 (1.2.0)
license-acceptance (1.0.13)
Expand Down Expand Up @@ -234,7 +234,7 @@ GEM
nori (2.6.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (15.1.5)
ohai (15.2.5)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
Expand Down Expand Up @@ -271,15 +271,15 @@ GEM
solve (4.0.2)
molinillo (~> 0.6)
semverse (>= 1.1, < 4.0)
strings (0.1.5)
strings (0.1.6)
strings-ansi (~> 0.1)
unicode-display_width (~> 1.5)
unicode_utils (~> 1.4)
strings-ansi (0.1.0)
structured_warnings (0.3.0)
syslog-logger (1.6.8)
systemu (2.6.5)
test-kitchen (2.2.5)
test-kitchen (2.3.1)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
license-acceptance (~> 1.0, >= 1.0.11)
Expand All @@ -296,16 +296,16 @@ GEM
toml-rb (1.1.2)
citrus (~> 3.0, > 3.0)
tomlrb (1.2.8)
train-core (2.1.13)
train-core (2.1.19)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0)
net-ssh (>= 2.9, < 6.0)
winrm (~> 2.0)
winrm-fs (~> 1.0)
tty-box (0.4.0)
tty-box (0.4.1)
pastel (~> 0.7.2)
strings (~> 0.1.5)
strings (~> 0.1.6)
tty-cursor (~> 0.7)
tty-color (0.5.0)
tty-cursor (0.7.0)
Expand Down
2 changes: 1 addition & 1 deletion omnibus_overrides.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
override "zlib", version: "1.2.11"
override "libzmq", version: "4.0.7"
override "openssl", version: "1.0.2s"
override "rust", version: "1.32.0"
override "rust", version: "1.37.0"

# For workstation app
override "nodejs", version: "10.9.0"