Bump version and show version in the About tab

alvr-org · Jul 21, 2020 · 9e0edc2 · 9e0edc2
1 parent bc95b83
commit 9e0edc2
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/alvr/common/Cargo.toml b/alvr/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'alvr_common'
-version = '12.0.0-alpha.0'
+version = '12.0.0-beta.1'
 authors = ['Riccardo Zaglia <[email protected]>']
 license = 'MIT'
 edition = '2018'

diff --git a/alvr/common/src/data/version.rs b/alvr/common/src/data/version.rs
@@ -6,7 +6,7 @@ pub const ALVR_NAME: &str = "ALVR";
 pub const ALVR_SERVER_VERSION: &str = env!("SERVER_VERSION");
 pub const ALVR_CLIENT_VERSION: &str = "12.0.0";
 
-pub const ALVR_SERVER_VERSION_REQ: &str = ">=12.0.0-alpha.0";
+pub const ALVR_SERVER_VERSION_REQ: &str = ">=12.0.0-beta.1";
 pub const ALVR_CLIENT_VERSION_REQ: &str = ">=12.0.0";
 
 pub fn is_version_compatible(version: &str, requirement: &str) -> StrResult<bool> {

diff --git a/alvr/server_bootstrap/Cargo.toml b/alvr/server_bootstrap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'alvr_server_bootstrap'
-version = '12.0.0-alpha.0'
+version = '12.0.0-beta.1'
 authors = ['Riccardo Zaglia <[email protected]>']
 license = 'MIT'
 edition = '2018'

diff --git a/alvr/server_driver/Cargo.toml b/alvr/server_driver/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'alvr_server_driver'
-version = '12.0.0-alpha.0'
+version = '12.0.0-beta.1'
 authors = ['Riccardo Zaglia <[email protected]>']
 license = 'MIT'
 edition = '2018'

diff --git a/alvr/web_server/Cargo.toml b/alvr/web_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'alvr_web_server'
-version = '12.0.0-alpha.0'
+version = '12.0.0-beta.1'
 authors = ['Riccardo Zaglia <[email protected]>']
 license = 'MIT'
 edition = '2018'

diff --git a/alvr/web_server/src/main.rs b/alvr/web_server/src/main.rs
@@ -309,6 +309,8 @@ async fn run(log_senders: Arc<Mutex<Vec<UnboundedSender<String>>>>) -> StrResult
         warp::reply()
     });
 
+    let version_request = warp::path("version").map(|| ALVR_SERVER_VERSION);
+
     warp::serve(
         index_request
             .or(settings_schema_request)
@@ -319,6 +321,7 @@ async fn run(log_senders: Arc<Mutex<Vec<UnboundedSender<String>>>>) -> StrResult
             .or(audio_devices_request)
             .or(files_requests)
             .or(restart_steamvr_request)
+            .or(version_request)
             .with(reply::with::header(
                 "Cache-Control",
                 "no-cache, no-store, must-revalidate",

diff --git a/server_release_template/web_gui/js/app/main.js b/server_release_template/web_gui/js/app/main.js
@@ -8,12 +8,13 @@ define([
     "app/setupWizard",
     "app/monitor",
     "json!../../session",
+    "text!../../version",
     "app/monitor",
     "js/lib/lobibox.min.js",
     "css!js/lib/lobibox.min.css"
 
 
-], function ($, bootstrap, _, mainTemplate, i18n, Settings, SetupWizard, Monitor, session) {
+], function ($, bootstrap, _, mainTemplate, i18n, Settings, SetupWizard, Monitor, session, version) {
     $(function () {
 
         var compiledTemplate = _.template(mainTemplate);
@@ -106,6 +107,8 @@ define([
                     }
                 })
             })
+
+            $("#version").text("v" + version);
         });
     });
 });
diff --git a/server_release_template/web_gui/js/app/templates/main.html b/server_release_template/web_gui/js/app/templates/main.html
@@ -71,7 +71,7 @@
             </div>
 
             <div class="tab-pane container fade" id="about">
-                <h1><%= about%></h1>
+                <h3>ALVR server <span id="version"></span></h3>
                 <%= aboutText%>
             </div>
         </div>