Merge pull request #302 from travis-ci/ps-stop-using-last-deploy-sha-buildpack
Use `HEROKU_SLUG_COMMIT` instead of last-commit-sha-buildpack
This commit is contained in:
commit
8a14ef827f
|
@ -1,3 +1,2 @@
|
||||||
https://github.com/heroku/heroku-buildpack-ruby.git
|
https://github.com/heroku/heroku-buildpack-ruby.git
|
||||||
https://github.com/drogus/last-commit-sha-buildpack.git
|
|
||||||
https://github.com/ryandotsmith/nginx-buildpack.git
|
https://github.com/ryandotsmith/nginx-buildpack.git
|
||||||
|
|
|
@ -26,6 +26,7 @@ require 'metriks/reporter/logger'
|
||||||
require 'metriks/librato_metrics_reporter'
|
require 'metriks/librato_metrics_reporter'
|
||||||
require 'travis/support/log_subscriber/active_record_metrics'
|
require 'travis/support/log_subscriber/active_record_metrics'
|
||||||
require 'fileutils'
|
require 'fileutils'
|
||||||
|
require 'securerandom'
|
||||||
|
|
||||||
module Travis::Api
|
module Travis::Api
|
||||||
end
|
end
|
||||||
|
@ -81,11 +82,7 @@ module Travis::Api
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.deploy_sha
|
def self.deploy_sha
|
||||||
@deploy_sha ||= File.exist?(deploy_sha_path) ? File.read(deploy_sha_path)[0..7] : 'deploy-sha'
|
@deploy_sha ||= ENV['HEROKU_SLUG_COMMIT'] || SecureRandom.hex(5)
|
||||||
end
|
|
||||||
|
|
||||||
def self.deploy_sha_path
|
|
||||||
File.expand_path('../../../../.deploy-sha', __FILE__)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
attr_accessor :app
|
attr_accessor :app
|
||||||
|
|
Loading…
Reference in New Issue
Block a user