summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-06-24 13:03:24 -0700
committerGitHub <noreply@github.com>2019-06-24 13:03:24 -0700
commite85fc1fabea36c4994361446c1962ba40f230939 (patch)
treec29a5a2b34a63d973d0a8705e994c418040f8147
parentfdbdc97b7f7bace8df63f11d452de4ff26567e6d (diff)
parent7d0c74a4c354e8e8712e91c010320c3ac2d0bb98 (diff)
downloadchef-e85fc1fabea36c4994361446c1962ba40f230939.tar.gz
Merge pull request #8688 from chef/archive
Update ffi-libarchive to 0.4.10
-rw-r--r--.expeditor/config.yml3
-rw-r--r--Gemfile.lock4
-rw-r--r--README.md2
-rw-r--r--omnibus/Gemfile.lock26
4 files changed, 19 insertions, 16 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index ca52c379ab..bbb13e4fd4 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -145,3 +145,6 @@ subscriptions:
- workload: ruby_gem_published:license-acceptance-*
actions:
- bash:.expeditor/update_dep.sh
+ - workload: ruby_gem_published:ffi-libarchive-*
+ actions:
+ - bash:.expeditor/update_dep.sh
diff --git a/Gemfile.lock b/Gemfile.lock
index 11903abae0..61073884cb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 065279661e0a99ade524de7549fa3e1eaf00b453
+ revision: 7e0dc7e7dec232d3b4f74f7e9bde422f4334aaa8
branch: master
specs:
ohai (15.1.5)
@@ -158,7 +158,7 @@ GEM
ffi (1.11.1)
ffi (1.11.1-x64-mingw32)
ffi (1.11.1-x86-mingw32)
- ffi-libarchive (0.4.6)
+ ffi-libarchive (0.4.10)
ffi (~> 1.0)
ffi-win32-extensions (1.0.3)
ffi
diff --git a/README.md b/README.md
index 19c283a098..6ba098e101 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Chef Infra
[![Code Climate](https://codeclimate.com/github/chef/chef.svg)](https://codeclimate.com/github/chef/chef)
-[![Build Status](https://badge.buildkite.com/c82093430ceec7d27af05febb9dcafe3aa331fff9d74c0ab9d.svg)](https://buildkite.com/chef-oss/chef-chef-master-verify)
+[![Build Status](https://badge.buildkite.com/c82093430ceec7d27af05febb9dcafe3aa331fff9d74c0ab9d.svg?branch=master)](https://buildkite.com/chef-oss/chef-chef-master-verify)
[![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/chef?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/chef/branch/master)
[![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef)
[![](https://img.shields.io/badge/Release%20Policy-Cadence%20Release-brightgreen.svg)](https://github.com/chef/chef-rfc/blob/master/rfc086-chef-oss-project-policies.md#cadence-release)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index f922fef519..1bdb7e9d80 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -32,17 +32,17 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
- aws-partitions (1.175.0)
- aws-sdk-core (3.55.0)
+ aws-partitions (1.177.0)
+ aws-sdk-core (3.56.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.21.0)
- aws-sdk-core (~> 3, >= 3.53.0)
+ aws-sdk-kms (1.22.0)
+ aws-sdk-core (~> 3, >= 3.56.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.42.0)
- aws-sdk-core (~> 3, >= 3.53.0)
+ aws-sdk-s3 (1.43.0)
+ aws-sdk-core (~> 3, >= 3.56.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.0)
@@ -154,14 +154,14 @@ GEM
concurrent-ruby (1.1.5)
diff-lcs (1.3)
ed25519 (1.2.4)
- equatable (0.5.0)
+ equatable (0.6.0)
erubis (2.7.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
ffi (1.11.1)
ffi (1.11.1-x64-mingw32)
ffi (1.11.1-x86-mingw32)
- ffi-libarchive (0.4.6)
+ ffi-libarchive (0.4.10)
ffi (~> 1.0)
ffi-win32-extensions (1.0.3)
ffi
@@ -233,7 +233,7 @@ GEM
nori (2.6.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (15.1.3)
+ ohai (15.1.5)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -245,9 +245,9 @@ GEM
plist (~> 3.1)
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
- pastel (0.7.2)
- equatable (~> 0.5.0)
- tty-color (~> 0.4.0)
+ pastel (0.7.3)
+ equatable (~> 0.6)
+ tty-color (~> 0.5)
pedump (0.5.2)
awesome_print
iostruct (>= 0.0.4)
@@ -306,7 +306,7 @@ GEM
pastel (~> 0.7.2)
strings (~> 0.1.5)
tty-cursor (~> 0.7)
- tty-color (0.4.3)
+ tty-color (0.5.0)
tty-cursor (0.7.0)
tty-prompt (0.19.0)
necromancer (~> 0.5.0)