Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sentry-ruby/lib/sentry/release_detector.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def detect_release(project_root:, running_on_heroku:)

def detect_release_from_heroku(running_on_heroku)
return unless running_on_heroku
ENV["HEROKU_SLUG_COMMIT"]
ENV["HEROKU_BUILD_COMMIT"] || ENV["HEROKU_SLUG_COMMIT"]
end

def detect_release_from_capistrano(project_root)
Expand Down
30 changes: 27 additions & 3 deletions sentry-ruby/spec/sentry_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1320,7 +1320,7 @@
end
end

it "returns nil + logs an warning if HEROKU_SLUG_COMMIT is not set" do
it "returns nil + logs an warning if HEROKU_BUILD_COMMIT is not set" do
string_io = StringIO.new
logger = Logger.new(string_io)

Expand All @@ -1332,13 +1332,37 @@
expect(string_io.string).to include(Sentry::Configuration::HEROKU_DYNO_METADATA_MESSAGE)
end

it "returns HEROKU_SLUG_COMMIT" do
it "returns HEROKU_BUILD_COMMIT" do
begin
ENV["HEROKU_SLUG_COMMIT"] = "REVISION"
ENV["HEROKU_BUILD_COMMIT"] = "REVISION"

described_class.init
expect(described_class.configuration.release).to eq("REVISION")
ensure
ENV["HEROKU_BUILD_COMMIT"] = nil
end
end

it "falls back to HEROKU_SLUG_COMMIT when HEROKU_BUILD_COMMIT is not set" do
begin
ENV["HEROKU_SLUG_COMMIT"] = "SLUG_REVISION"

described_class.init
expect(described_class.configuration.release).to eq("SLUG_REVISION")
ensure
ENV["HEROKU_SLUG_COMMIT"] = nil
end
end

it "prefers HEROKU_BUILD_COMMIT over HEROKU_SLUG_COMMIT" do
begin
ENV["HEROKU_BUILD_COMMIT"] = "BUILD_REVISION"
ENV["HEROKU_SLUG_COMMIT"] = "SLUG_REVISION"

described_class.init
expect(described_class.configuration.release).to eq("BUILD_REVISION")
ensure
ENV["HEROKU_BUILD_COMMIT"] = nil
ENV["HEROKU_SLUG_COMMIT"] = nil
end
end
Expand Down
Loading