From a2e4f4725e74b18bbf4150a683682fc57158bcd9 Mon Sep 17 00:00:00 2001 From: Jeremiah Hemphill Date: Tue, 18 Jan 2022 16:33:43 -0500 Subject: [PATCH 1/3] Reverted circleci config to debug publishing issue --- .circleci/config.yml | 13 +++++++++++++ CHANGELOG.md | 3 +++ Gemfile.lock | 2 +- lib/active_record/open_tracing/version.rb | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 763e3dc..6de21da 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -91,6 +91,19 @@ workflows: name: gem-build requires: - build + - pre-release-approval: + <<: *pr_only + type: approval + requires: + - gem-build + - gem/publish: + <<: *pr_only + name: gem-publish + to_rubygems: true + pre_release: true + requires: + - pre-release-approval + context: artifact_publishing final-release: jobs: diff --git a/CHANGELOG.md b/CHANGELOG.md index e8bd6ba..53302ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ Changelog ========= +## 0.5.1.pre 01/18/2022 + * Trying to fix the publishing process + ## 0.5.0 01/18/2022 * Added db.query_type and db.query_category tags * Added forwards compatibility code for the connection_config for rails 6.2 diff --git a/Gemfile.lock b/Gemfile.lock index 266d805..eed6573 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - activerecord-instrumentation (0.5.0) + activerecord-instrumentation (0.5.1.pre) activerecord opentracing (~> 0.5) diff --git a/lib/active_record/open_tracing/version.rb b/lib/active_record/open_tracing/version.rb index 4615d24..7b193b7 100644 --- a/lib/active_record/open_tracing/version.rb +++ b/lib/active_record/open_tracing/version.rb @@ -2,6 +2,6 @@ module ActiveRecord module OpenTracing - VERSION = "0.5.0" + VERSION = "0.5.1.pre" end end From e767a3b7840b2871889afcac7771dd1d51003803 Mon Sep 17 00:00:00 2001 From: Jeremiah Hemphill Date: Tue, 18 Jan 2022 16:35:10 -0500 Subject: [PATCH 2/3] more reverts --- .circleci/config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6de21da..2fe3ecc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -115,3 +115,11 @@ workflows: name: gem-build requires: - build + - gem/publish: + <<: *version_tags_only + name: gem-publish + to_rubygems: true + pre_release: false + requires: + - gem-build + context: artifact_publishing From 011be035253ef2fd6ffdc64483dc39251868428e Mon Sep 17 00:00:00 2001 From: Jeremiah Hemphill Date: Thu, 20 Jan 2022 17:08:50 -0500 Subject: [PATCH 3/3] Updated to release version --- CHANGELOG.md | 4 ++-- Gemfile.lock | 2 +- lib/active_record/open_tracing/version.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53302ab..1c32f31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ Changelog ========= -## 0.5.1.pre 01/18/2022 - * Trying to fix the publishing process +## 0.5.1 01/20/2022 + * Fixed the publishing process ## 0.5.0 01/18/2022 * Added db.query_type and db.query_category tags diff --git a/Gemfile.lock b/Gemfile.lock index eed6573..acea00e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - activerecord-instrumentation (0.5.1.pre) + activerecord-instrumentation (0.5.1) activerecord opentracing (~> 0.5) diff --git a/lib/active_record/open_tracing/version.rb b/lib/active_record/open_tracing/version.rb index 7b193b7..b194062 100644 --- a/lib/active_record/open_tracing/version.rb +++ b/lib/active_record/open_tracing/version.rb @@ -2,6 +2,6 @@ module ActiveRecord module OpenTracing - VERSION = "0.5.1.pre" + VERSION = "0.5.1" end end