Use version from git-describe to better identify builds

chore(deps): Bump h2 from 0.3.16 to 0.3.17

CHANGELOG.md

@@ -5,9 +5,42 @@ 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
+
 * Updated [`tracing-actix-web`](https://github.com/LukeMathWalker/tracing-actix-web) from 0.7.2 to 0.7.3 ([#578])
+* Updated [`serde`](https://github.com/serde-rs/serde) from 1.0.156 to 1.0.158 ([#580])
+* Updated [`mime`](https://github.com/hyperium/mime) from 0.3.16 to 0.3.17 ([#582])
+* Updated [`dotenvy`](https://github.com/allan2/dotenvy) from 0.15.6 to 0.15.7 ([#583])
+* Updated [`reqwest`](https://github.com/seanmonstar/reqwest) from 0.11.14 to 0.11.16 ([#586])
+* Updated [`tokio`](https://github.com/tokio-rs/tokio) from 1.26.0 to 1.27.0 ([#588])
+* Updated [`tempfile`](https://github.com/Stebalien/tempfile) from 3.4.0 to 3.5.0 ([#590])
+* Updated [`tracing-bunyan-formatter`](https://github.com/LukeMathWalker/tracing-bunyan-formatter) from 0.3.6 to 0.3.7 ([#593])
+* Updated [`serde`](https://github.com/serde-rs/serde) from 1.0.158 to 1.0.160 ([#594])
+* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.94 to 1.0.96 ([#595])
+* Updated [`openssl`](https://github.com/sfackler/rust-openssl) from 0.10.40 to 0.10.50, fixes [SEC#6], [SEC#7], and [SEC#8] ([#596])
 
 [#578]: https://github.com/vbrandl/hoc/pull/578
+[#580]: https://github.com/vbrandl/hoc/pull/580
+[#582]: https://github.com/vbrandl/hoc/pull/582
+[#583]: https://github.com/vbrandl/hoc/pull/583
+[#586]: https://github.com/vbrandl/hoc/pull/586
+[#588]: https://github.com/vbrandl/hoc/pull/588
+[#590]: https://github.com/vbrandl/hoc/pull/590
+[#593]: https://github.com/vbrandl/hoc/pull/593
+[#594]: https://github.com/vbrandl/hoc/pull/594
+[#595]: https://github.com/vbrandl/hoc/pull/595
+[#596]: https://github.com/vbrandl/hoc/pull/596
+
+[SEC#6]: https://github.com/vbrandl/hoc/security/dependabot/6
+[SEC#7]: https://github.com/vbrandl/hoc/security/dependabot/7
+[SEC#8]: https://github.com/vbrandl/hoc/security/dependabot/8
 
 
 ## [0.33.0] 2023-03-16

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "hoc"
-version = "0.33.0"
+version = "0.34.0"
 authors = ["Valentin Brandl <vbrandl@riseup.net>"]
 edition = "2021"
-build = "build.rs"
+build = "src/build.rs"
 
 [lib]
 path = "src/lib.rs"
@@ -18,15 +18,15 @@ actix-web = "4.3.1"
 badgers = "1.2.0"
 bytes = "1.4.0"
 config = { version = "0.13.3", features = ["toml"] }
-dotenvy = "0.15.6"
+dotenvy = "0.15.7"
 futures = "0.3.27"
 git2 = "0.16.1"
 lazy_static = "1.4.0"
 mime = "0.3"
 number_prefix = "0.4.0"
 openssl-probe = "0.1.5"
-reqwest = "0.11.14"
-serde = "1.0.156"
+reqwest = "0.11.16"
+serde = "1.0.158"
 serde_derive = "1.0.137"
 serde_json = "1.0.94"
 tracing = "0.1.37"
@@ -37,11 +37,12 @@ tracing-log = "0.1.3"
 tracing-subscriber = { version = "0.3.16", features = ["registry", "env-filter"] }
 
 [build-dependencies]
+anyhow = "1.0.70"
 ructe = { version = "0.16.1", features = ["mime03"] }
-vergen = { version = "7.5.1", default-features = false, features = ["git"] }
+vergen = { version = "8.1.1", default-features = false, features = ["git", "gitoxide"] }
 
 [dev-dependencies]
 awc = "3.1.1"
 ructe = "0.16.1"
-tempfile = "3.4.0"
-tokio = "1.26.0"
+tempfile = "3.5.0"
+tokio = "1.27.0"

Dockerfile

@@ -10,7 +10,7 @@ RUN echo 'fn main() { println!("Hello, world!"); }' >> src/main.rs
 COPY ./Cargo.lock ./Cargo.lock
 COPY ./Cargo.toml ./Cargo.toml
 # HACK: remove build-dependencies so we have at least some caching
-RUN head -n $(($(grep -n "\[build-dependencies\]" Cargo.toml | cut -f1 -d:) - 1)) Cargo.toml | sed '/build.rs/d' > \
+RUN head -n $(($(grep -n "\[build-dependencies\]" Cargo.toml | cut -f1 -d:) - 1)) Cargo.toml | sed '/src\/build.rs/d' > \
         Cargo.toml2  && rm Cargo.toml && mv Cargo.toml2 Cargo.toml
 # build to cache dependencies
 RUN cargo build --release
@@ -24,7 +24,6 @@ COPY ./.git ./.git
 # copy source code
 COPY ./static ./static
 COPY ./templates ./templates
-COPY ./build.rs ./build.rs
 COPY ./src ./src
 # build source code
 RUN cargo build --release

build.rs

@@ -1,15 +0,0 @@
-extern crate ructe;
-extern crate vergen;
-
-use ructe::{Ructe, RucteError};
-use vergen::{vergen, Config, ShaKind};
-
-fn main() -> Result<(), RucteError> {
-    let mut config = Config::default();
-    *config.git_mut().sha_kind_mut() = ShaKind::Short;
-    vergen(config).expect("Unable to generate static repo info");
-    let mut ructe = Ructe::from_env()?;
-    let mut statics = ructe.statics()?;
-    statics.add_files("static")?;
-    ructe.compile_templates("templates")
-}

src/build.rs

@@ -0,0 +1,15 @@
+use anyhow::Result;
+use ructe::Ructe;
+use vergen::EmitBuilder;
+
+fn main() -> Result<()> {
+    EmitBuilder::builder()
+        .git_sha(true)
+        .git_describe(true, true, None)
+        .emit()?;
+
+    let mut ructe = Ructe::from_env()?;
+    let mut statics = ructe.statics()?;
+    statics.add_files("static")?;
+    Ok(ructe.compile_templates("templates")?)
+}

src/statics.rs

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

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>