summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md13
-rw-r--r--Gemfile.lock22
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--omnibus/Gemfile.lock14
-rw-r--r--omnibus/config/software/more-ruby-cleanup.rb20
9 files changed, 52 insertions, 27 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01b11381fa..9d3bb2c61e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,17 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 16.0.277 -->
+## [v16.0.277](https://github.com/chef/chef/tree/v16.0.277) (2020-05-06)
+
+#### Merged Pull Requests
+- Update omnibus-software for new msys2 path [#9801](https://github.com/chef/chef/pull/9801) ([jaymalasinha](https://github.com/jaymalasinha))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=16.0.275 -->
+### Changes not yet released to stable
+
+#### Merged Pull Requests
+- Update omnibus-software for new msys2 path [#9801](https://github.com/chef/chef/pull/9801) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 16.0.277 -->
+- More cleanup of our installed gems [#9802](https://github.com/chef/chef/pull/9802) ([tas50](https://github.com/tas50)) <!-- 16.0.276 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6bd4093a03..72c5caaffd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (16.0.275)
+ chef (16.0.277)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.0.275)
- chef-utils (= 16.0.275)
+ chef-config (= 16.0.277)
+ chef-utils (= 16.0.277)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -61,12 +61,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (16.0.275-universal-mingw32)
+ chef (16.0.277-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.0.275)
- chef-utils (= 16.0.275)
+ chef-config (= 16.0.277)
+ chef-utils (= 16.0.277)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -111,15 +111,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.0.275)
- chef (= 16.0.275)
+ chef-bin (16.0.277)
+ chef (= 16.0.277)
PATH
remote: chef-config
specs:
- chef-config (16.0.275)
+ chef-config (16.0.277)
addressable
- chef-utils (= 16.0.275)
+ chef-utils (= 16.0.277)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -128,7 +128,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.0.275)
+ chef-utils (16.0.277)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 4477c54490..7ca62ea42b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.0.275 \ No newline at end of file
+16.0.277 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 8a1c664ce9..ee71d9337d 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "16.0.275".freeze
+ VERSION = "16.0.277".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index b9784ce6b9..dc8a698a51 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "16.0.275".freeze
+ VERSION = "16.0.277".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 678c9579a3..1b4de7ebca 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "16.0.275".freeze
+ VERSION = "16.0.277".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 8abfe5f278..c72dadfc35 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("16.0.275")
+ VERSION = Chef::VersionString.new("16.0.277")
end
#
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 6d410e6ff7..e48cf6e0c7 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: fb089c39c178da353d1d89a1f4bd79b6cbb78b77
+ revision: 3327abfbe926622e8759a7001ebc0ed40e74a533
branch: master
specs:
- omnibus (7.0.9)
+ omnibus (7.0.10)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-sugar (>= 3.3)
@@ -11,14 +11,14 @@ GIT
license_scout (~> 1.0)
mixlib-shellout (>= 2.0, < 4.0)
mixlib-versioning
- ohai (>= 13, < 16)
+ ohai (>= 13, < 17)
pedump
ruby-progressbar (~> 1.7)
thor (>= 0.18, < 2.0)
GIT
remote: https://github.com/chef/omnibus-software
- revision: 5f57d0a9243cc4c476d2acafc9aaafd61ceb1b03
+ revision: 8f5fafe1dff1e3f6d7fa92d79b6e42e82bd8a097
branch: master
specs:
omnibus-software (4.0.0)
@@ -32,8 +32,8 @@ GEM
artifactory (3.0.12)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.304.0)
- aws-sdk-core (3.94.0)
+ aws-partitions (1.309.0)
+ aws-sdk-core (3.94.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
@@ -41,7 +41,7 @@ GEM
aws-sdk-kms (1.30.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.63.0)
+ aws-sdk-s3 (1.63.1)
aws-sdk-core (~> 3, >= 3.83.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
diff --git a/omnibus/config/software/more-ruby-cleanup.rb b/omnibus/config/software/more-ruby-cleanup.rb
index 5ffbb43452..f5af0501cd 100644
--- a/omnibus/config/software/more-ruby-cleanup.rb
+++ b/omnibus/config/software/more-ruby-cleanup.rb
@@ -25,12 +25,23 @@ license :project_license
source path: "#{project.files_path}/#{name}"
build do
+ block "Removing console and setup binaries" do
+ Dir.glob("#{install_dir}/embedded/lib/ruby/gems/*/gems/*/bin/{console,setup}").each do |f|
+ puts "Deleting #{f}"
+ FileUtils.rm_rf(f)
+ end
+ end
+end
+
+build do
block "Removing additional non-code files from installed gems" do
# find the embedded ruby gems dir and clean it up for globbing
target_dir = "#{install_dir}/embedded/lib/ruby/gems/*/gems".tr('\\', "/")
files = %w{
+ *-public_cert.pem
*.blurb
*Upgrade.md
+ .dockerignore
autotest
autotest/*
bench
@@ -39,6 +50,7 @@ build do
design_rationale.rb
doc
doc-api
+ Dockerfile*
docs
ed25519.png
example
@@ -55,6 +67,7 @@ build do
rakelib
sample
samples
+ samus.json
site
test
tests
@@ -84,8 +97,11 @@ build do
}
Dir.glob(Dir.glob("#{target_dir}/*/{#{files.join(",")}}")).each do |f|
- # don't delete these files if there's a bin dir in the same dir or we're in a chef owned gem
- next if Dir.exist?(File.join(File.dirname(f), "bin")) || File.basename(File.expand_path("..", f)).start_with?("chef-")
+ # don't delete these files if there's a non-empty bin dir in the same dir
+ next if Dir.exist?(File.join(File.dirname(f), "bin")) && !Dir.empty?(File.join(File.dirname(f), "bin"))
+
+ # don't perform this cleanup in chef gems
+ next if File.basename(File.expand_path("..", f)).start_with?("chef-")
puts "Deleting #{f}"
FileUtils.rm_rf(f)
View Lorry Controller Status