vbrandl/hoc
1
0
Fork 0
Code Issues 1 Pull Requests Actions Projects Releases Wiki Activity

Merge pull request #601 from vbrandl/revert-600-feature/version-from-git-describe
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Revert "Use version from git-describe to better identify builds"
This commit is contained in:
Valentin Brandl 2023-04-14 00:51:17 +02:00 committed by GitHub
commit b14e6cbf71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/build.rs
View File

@ -3,10 +3,7 @@ use ructe::Ructe;
use vergen::EmitBuilder; use vergen::EmitBuilder;
fn main() -> Result<()> { fn main() -> Result<()> {
EmitBuilder::builder() EmitBuilder::builder().git_sha(true).emit()?;
.git_sha(true)
.git_describe(true, true, None)
.emit()?;
let mut ructe = Ructe::from_env()?; let mut ructe = Ructe::from_env()?;
let mut statics = ructe.statics()?; let mut statics = ructe.statics()?;

3
src/statics.rs
View File

@ -5,8 +5,7 @@ pub struct VersionInfo<'a> {
pub(crate) const VERSION_INFO: VersionInfo = VersionInfo { pub(crate) const VERSION_INFO: VersionInfo = VersionInfo {
commit: env!("VERGEN_GIT_SHA"), commit: env!("VERGEN_GIT_SHA"),
version: env!("VERGEN_GIT_DESCRIBE"), version: env!("CARGO_PKG_VERSION"),
// version: env!("CARGO_PKG_VERSION"),
}; };
lazy_static! { lazy_static! {

2
templates/base.rs.html
View File

@ -35,7 +35,7 @@
<nav> <nav>
<ul> <ul>
<li> <li>
<small>HoC @version_info.version - <a href="https://github.com/vbrandl/hoc/commit/@version_info.commit">@version_info.commit</a></small> <small>HoC v@version_info.version - <a href="https://github.com/vbrandl/hoc/commit/@version_info.commit">@version_info.commit</a></small>
</li> </li>
</ul> </ul>
</nav> </nav>