From 21a6ef4834027fb1282ca41ba3efea2630276834 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Sun, 5 Apr 2020 15:54:56 -0500 Subject: [PATCH] expose lila version on lichess.org/source - closes #6305, closes #6292 --- .github/workflows/server.yml | 1 + .gitignore | 1 + app/Env.scala | 1 + app/views/site/help.scala | 9 +++++++-- conf/application.conf.default | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index a05838cdab..f55b7cc3b1 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -35,6 +35,7 @@ jobs: - uses: olafurpg/setup-scala@49fc8c734ef6916b4e1da8ba8d81bb26a2b46a06 # v7 with: java-version: openjdk@1.13.0-2 + - run: echo "app.version = \"\"\"$(git log -1 --pretty='format:%h / %ar / %s')\"\"\"" > conf/version.conf - run: ./lila -Depoll=true "test;dist" - run: unzip target/universal/lila-3.0.zip - run: cp LICENSE COPYING.md README.md lila-3.0 && git log -n 1 --pretty=oneline > lila-3.0/commit.txt diff --git a/.gitignore b/.gitignore index 02b5bcb5af..fc5bccab40 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .sbtopts conf/application.conf +conf/version.conf logs project/project diff --git a/app/Env.scala b/app/Env.scala index 483c87a0cc..48399b97d1 100644 --- a/app/Env.scala +++ b/app/Env.scala @@ -85,6 +85,7 @@ final class Env( val isStage = config.get[Boolean]("app.stage") val explorerEndpoint = config.get[String]("explorer.endpoint") val tablebaseEndpoint = config.get[String]("explorer.tablebase.endpoint") + val appVersion = config.get[String]("app.version") def net = common.netConfig diff --git a/app/views/site/help.scala b/app/views/site/help.scala index 87339a44c6..2c8dab6c2b 100644 --- a/app/views/site/help.scala +++ b/app/views/site/help.scala @@ -34,12 +34,17 @@ object help { contentCls = "page" )( frag( - div(cls := "box box-pad body")( + st.section(cls := "box box-pad body")( h1(title), raw(~doc.getHtml("doc.content", resolver)) ), br, - div(cls := "box")(freeJs()) + st.section(cls := "box box-pad")( + h1("lila version"), + pre(env.appVersion) + ), + br, + st.section(cls := "box")(freeJs()) ) ) } diff --git a/conf/application.conf.default b/conf/application.conf.default index 9251aae059..eee2cb3753 100644 --- a/conf/application.conf.default +++ b/conf/application.conf.default @@ -1,3 +1,4 @@ include "base" +include "version" # override values from base.conf here