Compare commits

...

55 Commits

Author SHA1 Message Date
834085df92 Bump version
Some checks failed
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is failing
2023-04-13 12:19:38 +02:00
fd3746e781 Merge pull request #592 from vbrandl/dependabot/cargo/vergen-8.1.1
chore(deps): Bump vergen from 7.5.1 to 8.1.1
2023-04-13 12:08:51 +02:00
45b45eebc2 Apply cargo fmt
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-13 11:56:41 +02:00
914ee4b637 Update to vergen 8
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-13 11:55:52 +02:00
e57294ff4c chore(deps): Bump vergen from 7.5.1 to 8.1.1
Bumps [vergen](https://github.com/rustyhorde/vergen) from 7.5.1 to 8.1.1.
- [Release notes](https://github.com/rustyhorde/vergen/releases)
- [Commits](https://github.com/rustyhorde/vergen/compare/7.5.1...8.1.1)

---
updated-dependencies:
- dependency-name: vergen
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-13 09:47:29 +00:00
7129c8f9c4 Merge pull request #590 from vbrandl/dependabot/cargo/tempfile-3.5.0
chore(deps): Bump tempfile from 3.4.0 to 3.5.0
2023-04-13 11:46:53 +02:00
80235319b8 Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-13 11:39:25 +02:00
68b31cbcdb chore(deps): Bump tempfile from 3.4.0 to 3.5.0
Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/Stebalien/tempfile/releases)
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/NEWS)
- [Commits](https://github.com/Stebalien/tempfile/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-13 09:37:12 +00:00
1fabfdc27c Merge pull request #588 from vbrandl/dependabot/cargo/tokio-1.27.0
chore(deps): Bump tokio from 1.26.0 to 1.27.0
2023-04-13 11:36:35 +02:00
02c6a7ccc8 Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-13 11:23:19 +02:00
5652f46e2f chore(deps): Bump tokio from 1.26.0 to 1.27.0
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.26.0 to 1.27.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.26.0...tokio-1.27.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-13 09:21:30 +00:00
140074171b Merge pull request #586 from vbrandl/dependabot/cargo/reqwest-0.11.16
chore(deps): Bump reqwest from 0.11.14 to 0.11.16
2023-04-13 11:20:54 +02:00
519925762a Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-13 11:17:17 +02:00
e669499a6f chore(deps): Bump reqwest from 0.11.14 to 0.11.16
Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.14 to 0.11.16.
- [Release notes](https://github.com/seanmonstar/reqwest/releases)
- [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.14...v0.11.16)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-13 09:14:26 +00:00
7ef2f8f87c Merge pull request #583 from vbrandl/dependabot/cargo/dotenvy-0.15.7
chore(deps): Bump dotenvy from 0.15.6 to 0.15.7
2023-04-13 11:13:48 +02:00
30ef5cf41f Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-13 11:07:24 +02:00
5c5b848177 chore(deps): Bump dotenvy from 0.15.6 to 0.15.7
Bumps [dotenvy](https://github.com/allan2/dotenvy) from 0.15.6 to 0.15.7.
- [Release notes](https://github.com/allan2/dotenvy/releases)
- [Changelog](https://github.com/allan2/dotenvy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/allan2/dotenvy/compare/v0.15.6...v0.15.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-13 09:06:00 +00:00
ba72053fa1 Merge pull request #582 from vbrandl/dependabot/cargo/mime-0.3.17
chore(deps): Bump mime from 0.3.16 to 0.3.17
2023-04-13 11:05:11 +02:00
79c94f964f Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-13 10:50:05 +02:00
36c0b08067 chore(deps): Bump mime from 0.3.16 to 0.3.17
Bumps [mime](https://github.com/hyperium/mime) from 0.3.16 to 0.3.17.
- [Release notes](https://github.com/hyperium/mime/releases)
- [Commits](https://github.com/hyperium/mime/compare/v0.3.16...v0.3.17)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-21 05:02:57 +00:00
78383c291b Merge pull request #580 from vbrandl/dependabot/cargo/serde-1.0.158
All checks were successful
continuous-integration/drone/push Build is passing
chore(deps): Bump serde from 1.0.156 to 1.0.158
2023-03-20 15:15:11 +01:00
fe271c764e Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-20 13:21:11 +01:00
29f9765254 chore(deps): Bump serde from 1.0.156 to 1.0.158
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.156 to 1.0.158.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.156...v1.0.158)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-20 12:19:56 +00:00
70d21bd0db Merge pull request #578 from vbrandl/dependabot/cargo/tracing-actix-web-0.7.3
chore(deps): Bump tracing-actix-web from 0.7.2 to 0.7.3
2023-03-20 13:18:30 +01:00
fdd2883f3b Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-20 13:10:46 +01:00
aff5ba2e0b chore(deps): Bump tracing-actix-web from 0.7.2 to 0.7.3
Bumps [tracing-actix-web](https://github.com/LukeMathWalker/tracing-actix-web) from 0.7.2 to 0.7.3.
- [Release notes](https://github.com/LukeMathWalker/tracing-actix-web/releases)
- [Commits](https://github.com/LukeMathWalker/tracing-actix-web/compare/v0.7.2...v0.7.3)

---
updated-dependencies:
- dependency-name: tracing-actix-web
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-20 05:01:41 +00:00
5b2d1e9016 Merge pull request #577 from vbrandl/release/v0.33.0
All checks were successful
continuous-integration/drone/push Build is passing
release/v0.33.0
2023-03-16 15:29:23 +01:00
a93400ac14 Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-16 14:34:39 +01:00
b03e316c89 Bump version to 0.33.0
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-16 14:32:10 +01:00
3f2a359a90 Use edition 2021 2023-03-16 14:31:49 +01:00
fba01cd0c8 Merge pull request #576 from vbrandl/dependabot/cargo/serde-1.0.156
chore(deps): Bump serde from 1.0.152 to 1.0.156
2023-03-16 13:51:25 +01:00
e67696406b Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-16 13:43:33 +01:00
ad9579418e chore(deps): Bump serde from 1.0.152 to 1.0.156
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.152 to 1.0.156.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.152...v1.0.156)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-16 12:32:25 +00:00
540f30d472 Merge pull request #575 from vbrandl/dependabot/cargo/futures-0.3.27
chore(deps): Bump futures from 0.3.26 to 0.3.27
2023-03-16 13:31:05 +01:00
4f9cd72115 Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-16 13:25:22 +01:00
3612684709 chore(deps): Bump futures from 0.3.26 to 0.3.27
Bumps [futures](https://github.com/rust-lang/futures-rs) from 0.3.26 to 0.3.27.
- [Release notes](https://github.com/rust-lang/futures-rs/releases)
- [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.26...0.3.27)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-13 05:01:24 +00:00
0cb9deca71 Merge pull request #571 from vbrandl/release/v0.32.0
All checks were successful
continuous-integration/drone/push Build is passing
release/v0.32.0
2023-03-06 14:02:46 +01:00
52f3895af8 Bump version to 0.32.0
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-06 13:45:31 +01:00
d8e51e8c74 Update changelog 2023-03-06 13:45:02 +01:00
35d2315812 Merge pull request #570 from vbrandl/dependabot/cargo/serde_json-1.0.94
chore(deps): Bump serde_json from 1.0.93 to 1.0.94
2023-03-06 13:44:25 +01:00
7caf69b5f0 Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-06 13:19:35 +01:00
e3f1d3ef10 chore(deps): Bump serde_json from 1.0.93 to 1.0.94
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.93 to 1.0.94.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.93...v1.0.94)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-06 12:13:01 +00:00
a0d8618722 Merge pull request #569 from vbrandl/dependabot/cargo/tokio-1.26.0
chore(deps): Bump tokio from 1.25.0 to 1.26.0
2023-03-06 12:56:57 +01:00
35232d226d Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-06 12:50:14 +01:00
48318ee1bc chore(deps): Bump tokio from 1.25.0 to 1.26.0
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.25.0 to 1.26.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.25.0...tokio-1.26.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-06 11:49:07 +00:00
b7690c062f Merge pull request #568 from vbrandl/dependabot/cargo/awc-3.1.1
chore(deps): Bump awc from 3.1.0 to 3.1.1
2023-03-06 12:47:52 +01:00
239f94f830 Update changelog 2023-03-06 12:41:05 +01:00
7b772d2efd chore(deps): Bump awc from 3.1.0 to 3.1.1
Bumps [awc](https://github.com/actix/actix-web) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/actix/actix-web/releases)
- [Changelog](https://github.com/actix/actix-web/blob/master/CHANGES.md)
- [Commits](https://github.com/actix/actix-web/compare/awc-v3.1.0...awc-v3.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-06 11:38:42 +00:00
54ea0dc7c4 Merge pull request #567 from vbrandl/dependabot/cargo/tempfile-3.4.0
chore(deps): Bump tempfile from 3.3.0 to 3.4.0
2023-03-06 12:37:28 +01:00
4bb1925fa0 Update changelog 2023-03-06 12:28:34 +01:00
15f77906e1 chore(deps): Bump tempfile from 3.3.0 to 3.4.0
Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/Stebalien/tempfile/releases)
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/NEWS)
- [Commits](https://github.com/Stebalien/tempfile/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-06 11:27:47 +00:00
b5207b0c67 Merge pull request #566 from vbrandl/dependabot/cargo/actix-web-4.3.1
chore(deps): Bump actix-web from 4.3.0 to 4.3.1
2023-03-06 12:23:46 +01:00
583a746714 Update changelog 2023-03-06 12:21:04 +01:00
9e9220afbb chore(deps): Bump actix-web from 4.3.0 to 4.3.1
Bumps [actix-web](https://github.com/actix/actix-web) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/actix/actix-web/releases)
- [Changelog](https://github.com/actix/actix-web/blob/master/CHANGES.md)
- [Commits](https://github.com/actix/actix-web/compare/web-v4.3.0...web-v4.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-27 05:03:34 +00:00
2e12c9367e Merge pull request #565 from vbrandl/release/v0.31.0
All checks were successful
continuous-integration/drone/push Build is passing
Release/v0.31.0
2023-02-13 23:55:55 +01:00
6 changed files with 1318 additions and 553 deletions

View File

@ -6,6 +6,64 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
## [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
* Updated [`futures`](https://github.com/rust-lang/futures-rs) from 0.3.26 to 0.3.27 ([#575])
* Updated [`serde`](https://github.com/serde-rs/serde) from 1.0.152 to 1.0.156 ([#576])
* Use edition 2021 ([#577])
[#575]: https://github.com/vbrandl/hoc/pull/575
[#576]: https://github.com/vbrandl/hoc/pull/576
[#577]: https://github.com/vbrandl/hoc/pull/577
## [0.32.0] 2023-03-06
* Updated [`actix-web`](https://github.com/actix/actix-web) from 4.3.0 to 4.3.1 ([#566])
* Updated [`tempfile`](https://github.com/Stebalien/tempfile) from 3.3.0 to 3.4.0 ([#567])
* Updated [`awc`](https://github.com/actix/actix-web) from 3.1.0 to 3.1.1 ([#568])
* Updated [`tokio`](https://github.com/tokio-rs/tokio) from 1.25.0 to 1.26.0 ([#569])
* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.93 to 1.0.94 ([#570])
[#566]: https://github.com/vbrandl/hoc/pull/566
[#567]: https://github.com/vbrandl/hoc/pull/567
[#568]: https://github.com/vbrandl/hoc/pull/568
[#569]: https://github.com/vbrandl/hoc/pull/569
[#570]: https://github.com/vbrandl/hoc/pull/570
## [0.31.0] 2023-02-13 ## [0.31.0] 2023-02-13
### Dependency Updates ### Dependency Updates

1755
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,9 @@
[package] [package]
name = "hoc" name = "hoc"
version = "0.31.0" version = "0.34.0"
authors = ["Valentin Brandl <vbrandl@riseup.net>"] authors = ["Valentin Brandl <vbrandl@riseup.net>"]
edition = "2018" edition = "2021"
build = "build.rs" build = "src/build.rs"
[lib] [lib]
path = "src/lib.rs" path = "src/lib.rs"
@ -14,34 +14,35 @@ name = "hoc"
[dependencies] [dependencies]
actix-rt = "2.8.0" actix-rt = "2.8.0"
actix-web = "4.3.0" actix-web = "4.3.1"
badgers = "1.2.0" badgers = "1.2.0"
bytes = "1.4.0" bytes = "1.4.0"
config = { version = "0.13.3", features = ["toml"] } config = { version = "0.13.3", features = ["toml"] }
dotenvy = "0.15.6" dotenvy = "0.15.7"
futures = "0.3.26" futures = "0.3.27"
git2 = "0.16.1" git2 = "0.16.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"
openssl-probe = "0.1.5" openssl-probe = "0.1.5"
reqwest = "0.11.14" reqwest = "0.11.16"
serde = "1.0.152" serde = "1.0.158"
serde_derive = "1.0.137" serde_derive = "1.0.137"
serde_json = "1.0.93" serde_json = "1.0.94"
tracing = "0.1.37" tracing = "0.1.37"
tracing-actix-web = "0.7.2" tracing-actix-web = "0.7.3"
tracing-bunyan-formatter = "0.3.6" tracing-bunyan-formatter = "0.3.6"
tracing-futures = "0.2.5" tracing-futures = "0.2.5"
tracing-log = "0.1.3" tracing-log = "0.1.3"
tracing-subscriber = { version = "0.3.16", features = ["registry", "env-filter"] } tracing-subscriber = { version = "0.3.16", features = ["registry", "env-filter"] }
[build-dependencies] [build-dependencies]
anyhow = "1.0.70"
ructe = { version = "0.16.1", features = ["mime03"] } 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] [dev-dependencies]
awc = "3.1.0" awc = "3.1.1"
ructe = "0.16.1" ructe = "0.16.1"
tempfile = "3.3.0" tempfile = "3.5.0"
tokio = "1.25.0" tokio = "1.27.0"

View File

@ -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")
}

12
src/build.rs Normal file
View File

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

View File

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