Compare commits

...

8 Commits

Author SHA1 Message Date
6f23f4c13d Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-17 09:12:13 +02:00
f1640fdc36 chore(deps): Bump git2 from 0.17.0 to 0.17.1
Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/rust-lang/git2-rs/releases)
- [Changelog](https://github.com/rust-lang/git2-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/git2-rs/compare/git2-curl-0.17.0...0.17.1)

---
updated-dependencies:
- dependency-name: git2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-17 05:00:31 +00:00
3f6fb6bac9 Merge pull request #602 from vbrandl/dependabot/cargo/git2-0.17.0
All checks were successful
continuous-integration/drone/push Build is passing
chore(deps): Bump git2 from 0.16.1 to 0.17.0
2023-04-14 12:53:39 +02:00
3b51b2c7df Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-14 12:48:39 +02:00
d0ce2c7f89 chore(deps): Bump git2 from 0.16.1 to 0.17.0
Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.16.1 to 0.17.0.
- [Release notes](https://github.com/rust-lang/git2-rs/releases)
- [Changelog](https://github.com/rust-lang/git2-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/git2-rs/compare/0.16.1...git2-curl-0.17.0)

---
updated-dependencies:
- dependency-name: git2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-14 04:59:18 +00:00
b14e6cbf71 Merge pull request #601 from vbrandl/revert-600-feature/version-from-git-describe
All checks were successful
continuous-integration/drone/push Build is passing
Revert "Use version from git-describe to better identify builds"
2023-04-14 00:51:17 +02:00
a9b7368847 Revert "Use version from git-describe to better identify builds" 2023-04-14 00:50:35 +02:00
b3cc22af6c Merge pull request #600 from vbrandl/feature/version-from-git-describe
All checks were successful
continuous-integration/drone/push Build is passing
Use version from git-describe to better identify builds
2023-04-14 00:43:13 +02:00
6 changed files with 14 additions and 14 deletions

View File

@ -6,8 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
* Updated [`h2`](https://github.com/hyperium/h2) from 0.3.16 to 0.3.17, fixes [SEC#11] ([#599]) * Updated [`h2`](https://github.com/hyperium/h2) from 0.3.16 to 0.3.17, fixes [SEC#11] ([#599])
* Updated [`git2`](https://github.com/rust-lang/git2-rs) from 0.16.1 to 0.17.0 ([#602])
* Updated [`git2`](https://github.com/rust-lang/git2-rs) from 0.17.0 to 0.17.1 ([#603])
[#599]: https://github.com/vbrandl/hoc/pull/599 [#599]: https://github.com/vbrandl/hoc/pull/599
[#602]: https://github.com/vbrandl/hoc/pull/602
[#603]: https://github.com/vbrandl/hoc/pull/603
[SEC#11]: https://github.com/vbrandl/hoc/security/dependabot/11 [SEC#11]: https://github.com/vbrandl/hoc/security/dependabot/11

12
Cargo.lock generated
View File

@ -821,9 +821,9 @@ dependencies = [
[[package]] [[package]]
name = "git2" name = "git2"
version = "0.16.1" version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" checksum = "8b7905cdfe33d31a88bb2e8419ddd054451f5432d1da9eaf2ac7804ee1ea12d5"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"libc", "libc",
@ -1634,9 +1634,9 @@ checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
[[package]] [[package]]
name = "libgit2-sys" name = "libgit2-sys"
version = "0.14.2+1.5.1" version = "0.15.1+1.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" checksum = "fb4577bde8cdfc7d6a2a4bcb7b049598597de33ffd337276e9c7db6cd4a2cee7"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
@ -1648,9 +1648,9 @@ dependencies = [
[[package]] [[package]]
name = "libssh2-sys" name = "libssh2-sys"
version = "0.2.23" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",

View File

@ -20,7 +20,7 @@ bytes = "1.4.0"
config = { version = "0.13.3", features = ["toml"] } config = { version = "0.13.3", features = ["toml"] }
dotenvy = "0.15.7" dotenvy = "0.15.7"
futures = "0.3.27" futures = "0.3.27"
git2 = "0.16.1" git2 = "0.17.1"
lazy_static = "1.4.0" lazy_static = "1.4.0"
mime = "0.3" mime = "0.3"
number_prefix = "0.4.0" number_prefix = "0.4.0"

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

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

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>