Compare commits
63 Commits
v0.31.0
...
feature/ve
Author | SHA1 | Date | |
---|---|---|---|
037e520beb
|
|||
|
119dcd4cff | ||
081ca836bc
|
|||
62114219e2
|
|||
|
38b86aa490 | ||
|
88eab864b1 | ||
|
864cbe1c73 | ||
|
ced16e2e6b | ||
|
834085df92 | ||
|
fd3746e781 | ||
|
45b45eebc2 | ||
|
914ee4b637 | ||
|
e57294ff4c | ||
|
7129c8f9c4 | ||
|
80235319b8 | ||
|
68b31cbcdb | ||
|
1fabfdc27c | ||
|
02c6a7ccc8 | ||
|
5652f46e2f | ||
|
140074171b | ||
|
519925762a | ||
|
e669499a6f | ||
|
7ef2f8f87c | ||
|
30ef5cf41f | ||
|
5c5b848177 | ||
|
ba72053fa1 | ||
|
79c94f964f | ||
|
36c0b08067 | ||
|
78383c291b | ||
|
fe271c764e | ||
|
29f9765254 | ||
|
70d21bd0db | ||
|
fdd2883f3b | ||
|
aff5ba2e0b | ||
|
5b2d1e9016 | ||
a93400ac14
|
|||
b03e316c89
|
|||
3f2a359a90
|
|||
|
fba01cd0c8 | ||
e67696406b
|
|||
|
ad9579418e | ||
|
540f30d472 | ||
4f9cd72115
|
|||
|
3612684709 | ||
|
0cb9deca71 | ||
52f3895af8
|
|||
d8e51e8c74
|
|||
|
35d2315812 | ||
7caf69b5f0
|
|||
|
e3f1d3ef10 | ||
|
a0d8618722 | ||
35232d226d
|
|||
|
48318ee1bc | ||
|
b7690c062f | ||
239f94f830
|
|||
|
7b772d2efd | ||
|
54ea0dc7c4 | ||
4bb1925fa0
|
|||
|
15f77906e1 | ||
|
b5207b0c67 | ||
583a746714
|
|||
|
9e9220afbb | ||
|
2e12c9367e |
64
CHANGELOG.md
64
CHANGELOG.md
@@ -5,6 +5,70 @@ 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])
|
||||||
|
|
||||||
|
[#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
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
|
1755
Cargo.lock
generated
1755
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
29
Cargo.toml
29
Cargo.toml
@@ -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"
|
||||||
|
@@ -10,7 +10,7 @@ RUN echo 'fn main() { println!("Hello, world!"); }' >> src/main.rs
|
|||||||
COPY ./Cargo.lock ./Cargo.lock
|
COPY ./Cargo.lock ./Cargo.lock
|
||||||
COPY ./Cargo.toml ./Cargo.toml
|
COPY ./Cargo.toml ./Cargo.toml
|
||||||
# HACK: remove build-dependencies so we have at least some caching
|
# 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
|
Cargo.toml2 && rm Cargo.toml && mv Cargo.toml2 Cargo.toml
|
||||||
# build to cache dependencies
|
# build to cache dependencies
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
@@ -24,7 +24,6 @@ COPY ./.git ./.git
|
|||||||
# copy source code
|
# copy source code
|
||||||
COPY ./static ./static
|
COPY ./static ./static
|
||||||
COPY ./templates ./templates
|
COPY ./templates ./templates
|
||||||
COPY ./build.rs ./build.rs
|
|
||||||
COPY ./src ./src
|
COPY ./src ./src
|
||||||
# build source code
|
# build source code
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
|
15
build.rs
15
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")
|
|
||||||
}
|
|
15
src/build.rs
Normal file
15
src/build.rs
Normal file
@@ -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")?)
|
||||||
|
}
|
@@ -4,8 +4,9 @@ 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!("VERGEN_GIT_DESCRIBE"),
|
||||||
|
// version: env!("CARGO_PKG_VERSION"),
|
||||||
};
|
};
|
||||||
|
|
||||||
lazy_static! {
|
lazy_static! {
|
||||||
|
@@ -35,7 +35,7 @@
|
|||||||
<nav>
|
<nav>
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<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>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
|
Reference in New Issue
Block a user