Use version from git-describe to better identify builds

chore(deps): Bump h2 from 0.3.16 to 0.3.17

CHANGELOG.md

@@ -5,6 +5,15 @@ 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])
@@ -12,6 +21,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * 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
@@ -20,6 +33,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#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.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",
@@ -1392,7 +1392,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hoc"
-version = "0.33.0"
+version = "0.34.0"
 dependencies = [
  "actix-rt",
  "actix-web",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hoc"
-version = "0.33.0"
+version = "0.34.0"
 authors = ["Valentin Brandl <vbrandl@riseup.net>"]
 edition = "2021"
 build = "src/build.rs"

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

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()?;

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! {

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>