From 6fe6bc1054ddce1c6f9f8c44f10cf0d2c57dc39e Mon Sep 17 00:00:00 2001 From: Ry Biesemeyer Date: Fri, 4 Mar 2022 17:33:49 -0800 Subject: [PATCH] Backport PR #13715 to 7.17: artifacts: omit openssl_pkcs8_pure specs from built artifacts (#13852) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * artifacts: omit openssl_pkcs8_pure specs from built artifacts (#13715) * artifacts: omit openssl_pkcs8_pure specs from built artifacts * Exclude _all_ top-level spec and test directories from built artifacts Co-authored-by: João Duarte Co-authored-by: João Duarte (cherry picked from commit 0369ba208db468d21c6277ffd091d6f4cfe0f501) * Update releasenotes.asciidoc (#13701) Fixed OS name. Ubuntu instead of Ununtu. Co-authored-by: Cris da Rocha --- docs/static/releasenotes.asciidoc | 2 +- rakelib/artifacts.rake | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/static/releasenotes.asciidoc b/docs/static/releasenotes.asciidoc index e2aad6bc5..da4766b34 100644 --- a/docs/static/releasenotes.asciidoc +++ b/docs/static/releasenotes.asciidoc @@ -3930,4 +3930,4 @@ Here are the plugin changes. - Tweaked logging statements to reduce verbosity - Fixed numerous issues relating to builds on Travis https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/799[#799] * logstash-output-s3 - - Fixed issue where on restart, 0 byte files could erroneously be uploaded to s3 https://github.com/logstash-plugins/logstash-output-s3/issues/195[#195] \ No newline at end of file + - Fixed issue where on restart, 0 byte files could erroneously be uploaded to s3 https://github.com/logstash-plugins/logstash-output-s3/issues/195[#195] diff --git a/rakelib/artifacts.rake b/rakelib/artifacts.rake index b735ad110..9319b0fe1 100644 --- a/rakelib/artifacts.rake +++ b/rakelib/artifacts.rake @@ -84,6 +84,10 @@ namespace "artifact" do @exclude_paths << "bin/rspec" @exclude_paths << "bin/rspec.bat" + # vendored test/spec artifacts from upstream + @exclude_paths << 'vendor/**/gems/*/test/**/*' + @exclude_paths << 'vendor/**/gems/*/spec/**/*' + @exclude_paths end