diff --git a/.gitignore b/.gitignore index d4620e61..32af8a97 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,3 @@ vendor/.bundle # Ignore Byebug command history file. .byebug_history -.env diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7e729726..71a7f158 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -42,4 +42,10 @@ module ApplicationHelper providers end end + + def version + Greenlight::VERSION + rescue + 'development' + end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 371ba109..b038e670 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -71,7 +71,7 @@ with BigBlueButton; if not, see . diff --git a/circle.yml b/circle.yml index 5667afd2..caf30c5c 100644 --- a/circle.yml +++ b/circle.yml @@ -10,4 +10,5 @@ deployment: hub: branch: master commands: + - ./scripts/set_version.sh - ./scripts/build_image_master.sh diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index 933d488b..a69d772e 100644 --- a/config/locales/en-us.yml +++ b/config/locales/en-us.yml @@ -71,7 +71,7 @@ en-US: no: No oauth_signup: Signup for customized sessions past_recordings: Past Recordings - powered_bigbluebutton_html: Powered by %{link} + footer_html: "%{greenlight_link} build %{version}, Powered by %{bbb_link}" presentation: Presentation previously_joined_meetings: Previously Joined Sessions return_to_room: Return to your personal room diff --git a/scripts/set_version.sh b/scripts/set_version.sh new file mode 100755 index 00000000..523e0e7f --- /dev/null +++ b/scripts/set_version.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "module Greenlight VERSION = ${CIRCLE_BUILD_NUM} end" >| $HOME/greenlight/app/lib/version.rb