From 13f598516bb1399dc6a23c2638154716edb9370b Mon Sep 17 00:00:00 2001 From: jwhl Date: Thu, 14 Nov 2024 13:12:43 +0000 Subject: [PATCH 1/5] Fixes bumpmatrix for main branch Signed-off-by: jwhl --- ...ion-Fixes-bumpmatrix-for-main-branch.patch | 33 +++++++++++++++++++ rubygem-elasticsearch-ruby.spec | 7 +++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0001-Automation-Fixes-bumpmatrix-for-main-branch.patch diff --git a/0001-Automation-Fixes-bumpmatrix-for-main-branch.patch b/0001-Automation-Fixes-bumpmatrix-for-main-branch.patch new file mode 100644 index 0000000..aa92b86 --- /dev/null +++ b/0001-Automation-Fixes-bumpmatrix-for-main-branch.patch @@ -0,0 +1,33 @@ +From 97a5c7cc8961e0d70fce100a9a13536fd497ddd9 Mon Sep 17 00:00:00 2001 +From: Fernando Briano +Date: Mon, 9 Sep 2024 16:34:57 +0100 +Subject: [PATCH] Automation: Fixes bumpmatrix for main branch + +--- + rake_tasks/automation.rake | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/rake_tasks/automation.rake b/rake_tasks/automation.rake +index 7268688bd..6edce2726 100644 +--- a/rake_tasks/automation.rake ++++ b/rake_tasks/automation.rake +@@ -104,10 +104,14 @@ namespace :automation do + files.each do |file| + content = File.read(file) + if file == '.buildkite/pipeline.yml' ++ require 'yaml' ++ yaml = YAML.safe_load(content) + branch = version.match(/([0-9]+\.[0-9]+)\.[0-9]+.*/)[1] +- old_branch = content.match(/ES_YAML_TESTS_BRANCH: ([0-9.]+)/)[1] +- content.gsub!(old_branch, branch) +- puts "[#{old_branch}] -> [#{branch}] in #{file.gsub('./', '')}" ++ yaml_tests_branch = yaml['steps'][1]['env']['ES_YAML_TESTS_BRANCH'] ++ next if yaml_tests_branch == 'main' ++ ++ content.gsub!(yaml_tests_branch, branch) ++ puts "[#{yaml_tests_branch}] -> [#{branch}] in #{file.gsub('./', '')}" + end + match = content.match(regexp) + next if match.nil? +-- +2.33.0 \ No newline at end of file diff --git a/rubygem-elasticsearch-ruby.spec b/rubygem-elasticsearch-ruby.spec index dc67503..d4a869c 100644 --- a/rubygem-elasticsearch-ruby.spec +++ b/rubygem-elasticsearch-ruby.spec @@ -3,12 +3,14 @@ %global elastic_prefix elasticsearch Name: rubygem-elasticsearch-ruby Version: 7.14.0 -Release: 2 +Release: 3 Summary: Ruby integrations for Elasticsearch License: Apache-2.0 URL: https://github.com/elastic/elasticsearch-ruby Source0: https://github.com/elastic/elasticsearch-ruby/archive/v%{version}/elasticsearch-ruby-%{version}.tar.gz +Patch0000: 0001-Automation-Fixes-bumpmatrix-for-main-branch.patch + BuildRequires: ruby BuildRequires: ruby-devel BuildRequires: rubygems @@ -137,6 +139,9 @@ done %{gem_dir}/doc/%{elastic_prefix}-transport-%{version}/* %changelog +* Fri Nov 15 2024 - 7.14.0-3 +- Automation: Fixes bumpmatrix for main branch + * Wed Feb 23 2022 baizhonggui - 7.14.0-2 - Add git buildrequire for fixing build error -- Gitee From 5aa3e25cd38cf5deba726e702e755e179101295c Mon Sep 17 00:00:00 2001 From: jwhl Date: Thu, 14 Nov 2024 13:39:35 +0000 Subject: [PATCH 2/5] update Signed-off-by: jwhl --- rubygem-elasticsearch-ruby.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-elasticsearch-ruby.spec b/rubygem-elasticsearch-ruby.spec index d4a869c..4aed3c0 100644 --- a/rubygem-elasticsearch-ruby.spec +++ b/rubygem-elasticsearch-ruby.spec @@ -9,7 +9,7 @@ License: Apache-2.0 URL: https://github.com/elastic/elasticsearch-ruby Source0: https://github.com/elastic/elasticsearch-ruby/archive/v%{version}/elasticsearch-ruby-%{version}.tar.gz -Patch0000: 0001-Automation-Fixes-bumpmatrix-for-main-branch.patch +Patch0: 0001-Automation-Fixes-bumpmatrix-for-main-branch.patch BuildRequires: ruby BuildRequires: ruby-devel -- Gitee From e6c3bcd0abbe86495c076635b1c4a795d52a5c5e Mon Sep 17 00:00:00 2001 From: jwhl Date: Thu, 14 Nov 2024 13:43:03 +0000 Subject: [PATCH 3/5] update Signed-off-by: jwhl --- rubygem-elasticsearch-ruby.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rubygem-elasticsearch-ruby.spec b/rubygem-elasticsearch-ruby.spec index 4aed3c0..8b7a26d 100644 --- a/rubygem-elasticsearch-ruby.spec +++ b/rubygem-elasticsearch-ruby.spec @@ -70,6 +70,7 @@ Ruby client for Elasticsearch. See the `elasticsearch` gem for full integration. %prep %autosetup -n elasticsearch-ruby-%{version} +%patch0 -p1 %build for gem_name in %{elastic_prefix} %{elastic_prefix}-api %{elastic_prefix}-transport ; -- Gitee From 5faccb54ea3071e8488445dadefd53a526cf74dc Mon Sep 17 00:00:00 2001 From: jwhl Date: Thu, 14 Nov 2024 13:54:06 +0000 Subject: [PATCH 4/5] update Signed-off-by: jwhl --- rubygem-elasticsearch-ruby.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/rubygem-elasticsearch-ruby.spec b/rubygem-elasticsearch-ruby.spec index 8b7a26d..4aed3c0 100644 --- a/rubygem-elasticsearch-ruby.spec +++ b/rubygem-elasticsearch-ruby.spec @@ -70,7 +70,6 @@ Ruby client for Elasticsearch. See the `elasticsearch` gem for full integration. %prep %autosetup -n elasticsearch-ruby-%{version} -%patch0 -p1 %build for gem_name in %{elastic_prefix} %{elastic_prefix}-api %{elastic_prefix}-transport ; -- Gitee From b3ada87d3052f9cb6f5698c851fb39c2f84263d8 Mon Sep 17 00:00:00 2001 From: jwhl Date: Thu, 14 Nov 2024 13:54:46 +0000 Subject: [PATCH 5/5] update Signed-off-by: jwhl --- rubygem-elasticsearch-ruby.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-elasticsearch-ruby.spec b/rubygem-elasticsearch-ruby.spec index 4aed3c0..beb4f86 100644 --- a/rubygem-elasticsearch-ruby.spec +++ b/rubygem-elasticsearch-ruby.spec @@ -69,7 +69,7 @@ BuildArch: noarch Ruby client for Elasticsearch. See the `elasticsearch` gem for full integration. %prep -%autosetup -n elasticsearch-ruby-%{version} +%autosetup -n elasticsearch-ruby-%{version} -p1 %build for gem_name in %{elastic_prefix} %{elastic_prefix}-api %{elastic_prefix}-transport ; -- Gitee