chore: fix git_sha in instance health (#8893)
- Fix git-hash in super admin instance health page for Heroku installations - Fix git boundary not set error for docker/heroku deployments which remove .git directory
This commit is contained in:
@@ -28,8 +28,7 @@ class SuperAdmin::InstanceStatusesController < SuperAdmin::ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def sha
|
def sha
|
||||||
sha = `git rev-parse HEAD`
|
@metrics['Git SHA'] = GIT_HASH
|
||||||
@metrics['Git SHA'] = sha.presence || 'n/a'
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def postgres_status
|
def postgres_status
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Define a method to fetch the git commit hash
|
# Define a method to fetch the git commit hash
|
||||||
def fetch_git_sha
|
def fetch_git_sha
|
||||||
sha = `git rev-parse HEAD`
|
sha = `git rev-parse HEAD` if File.directory?('.git')
|
||||||
if sha.present?
|
if sha.present?
|
||||||
sha.strip
|
sha.strip
|
||||||
elsif File.exist?('.git_sha')
|
elsif File.exist?('.git_sha')
|
||||||
|
|||||||
@@ -17,8 +17,7 @@ RSpec.describe 'Super Admin Instance status', type: :request do
|
|||||||
get '/super_admin/instance_status'
|
get '/super_admin/instance_status'
|
||||||
expect(response).to have_http_status(:success)
|
expect(response).to have_http_status(:success)
|
||||||
expect(response.body).to include('Chatwoot version')
|
expect(response.body).to include('Chatwoot version')
|
||||||
sha = `git rev-parse HEAD`
|
expect(response.body).to include(GIT_HASH)
|
||||||
expect(response.body).to include(sha)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user