Use version from git-describe to better identify builds

Merge pull request #599 from vbrandl/dependabot/cargo/h2-0.3.17
chore(deps): Bump h2 from 0.3.16 to 0.3.17
2023-04-14 00:39:47 +02:00 · 2023-04-14 00:33:37 +02:00 · 2023-04-14 00:30:11 +02:00 · 2023-04-14 00:26:53 +02:00 · 2023-04-13 17:09:49 +00:00 · 2023-04-13 13:09:08 +02:00
5 changed files with 15 additions and 5 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

+* Updated [`h2`](https://github.com/hyperium/h2) from 0.3.16 to 0.3.17, fixes [SEC#11] ([#599])
+
+[#599]: https://github.com/vbrandl/hoc/pull/599
+
+[SEC#11]: https://github.com/vbrandl/hoc/security/dependabot/11
+

 ## [0.34.0] 2023-04-13

--- a/Cargo.lock
+++ b/Cargo.lock
@ -1337,9 +1337,9 @@ dependencies = [

 [[package]]
 name = "h2"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d"
+checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f"
 dependencies = [
 "bytes",
 "fnv",
--- a/src/build.rs
+++ b/src/build.rs
@ -3,7 +3,10 @@ use ructe::Ructe;
 use vergen::EmitBuilder;

 fn main() -> Result<()> {
-    EmitBuilder::builder().git_sha(true).emit()?;
+    EmitBuilder::builder()
+        .git_sha(true)
+        .git_describe(true, true, None)
+        .emit()?;

    let mut ructe = Ructe::from_env()?;
    let mut statics = ructe.statics()?;
--- a/src/statics.rs
+++ b/src/statics.rs
@ -5,7 +5,8 @@ pub struct VersionInfo<'a> {

 pub(crate) const VERSION_INFO: VersionInfo = VersionInfo {
    commit: env!("VERGEN_GIT_SHA"),
-    version: env!("CARGO_PKG_VERSION"),
+    version: env!("VERGEN_GIT_DESCRIBE"),
+    // version: env!("CARGO_PKG_VERSION"),
 };

 lazy_static! {
--- a/templates/base.rs.html
+++ b/templates/base.rs.html
@ -35,7 +35,7 @@
 <nav>
    <ul>
        <li>
-            <small>HoC v@version_info.version - <a href="https://github.com/vbrandl/hoc/commit/@version_info.commit">@version_info.commit</a></small>
+            <small>HoC @version_info.version - <a href="https://github.com/vbrandl/hoc/commit/@version_info.commit">@version_info.commit</a></small>
        </li>
    </ul>
 </nav>
Author	SHA1	Message	Date
Valentin Brandl	037e520beb	Use version from git-describe to better identify builds All checks were successful continuous-integration/drone/push Build is passing Details	2023-04-14 00:39:47 +02:00
Valentin Brandl	119dcd4cff	Merge pull request #599 from vbrandl/dependabot/cargo/h2-0.3.17 chore(deps): Bump h2 from 0.3.16 to 0.3.17	2023-04-14 00:33:37 +02:00
Valentin Brandl	081ca836bc	Update changelog All checks were successful continuous-integration/drone/push Build is passing Details	2023-04-14 00:30:11 +02:00
Valentin Brandl	62114219e2	Update changelog All checks were successful continuous-integration/drone/push Build is passing Details	2023-04-14 00:26:53 +02:00
dependabot[bot]	38b86aa490	chore(deps): Bump h2 from 0.3.16 to 0.3.17 Bumps [h2](https://github.com/hyperium/h2) from 0.3.16 to 0.3.17. - [Release notes](https://github.com/hyperium/h2/releases) - [Changelog](https://github.com/hyperium/h2/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/h2/compare/v0.3.16...v0.3.17) --- updated-dependencies: - dependency-name: h2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-04-13 17:09:49 +00:00
Valentin Brandl	88eab864b1	Merge pull request #598 from vbrandl/fix/docker-build All checks were successful continuous-integration/drone/push Build is passing Details Fix docker build with moved `build.rs` script	2023-04-13 13:09:08 +02:00