Compare commits

...

10 Commits

Author SHA1 Message Date
1b0817bc25 Bump vergen from 4.1.0 to 5.1.0
All checks were successful
continuous-integration/drone/push Build is passing
Bumps [vergen](https://github.com/rustyhorde/vergen) from 4.1.0 to 5.1.0.
- [Release notes](https://github.com/rustyhorde/vergen/releases)
- [Commits](https://github.com/rustyhorde/vergen/compare/4.1.0...5.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-29 12:45:49 +02:00
f57dc8e890 Fix vergen 2021-03-29 12:45:49 +02:00
bdda6292d2 Bump vergen from 4.1.0 to 5.1.0
Bumps [vergen](https://github.com/rustyhorde/vergen) from 4.1.0 to 5.1.0.
- [Release notes](https://github.com/rustyhorde/vergen/releases)
- [Commits](https://github.com/rustyhorde/vergen/compare/4.1.0...5.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-29 12:45:49 +02:00
a2826c9922 Remove windows from test matrix
Some checks failed
continuous-integration/drone/push Build is failing
2021-03-29 12:44:55 +02:00
3b2a368df0 Merge pull request #247 from vbrandl/dependabot/cargo/config-0.11.0
Bump config from 0.10.1 to 0.11.0
2021-03-29 12:23:55 +02:00
8b7444bd7c Merge pull request #253 from vbrandl/feature/refactor2
Feature/refactor2
2021-03-29 12:12:58 +02:00
9d719e7d85 Merge pull request #252 from vbrandl/master
Refactor for testability
2021-03-29 12:12:09 +02:00
584379e047 Merge pull request #250 from vbrandl/dependabot/cargo/serde-1.0.125
Bump serde from 1.0.123 to 1.0.125
2021-03-29 12:10:50 +02:00
951124e038 Bump serde from 1.0.123 to 1.0.125
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.123 to 1.0.125.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.123...v1.0.125)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-23 04:24:16 +00:00
cba235eadf Bump config from 0.10.1 to 0.11.0
Bumps [config](https://github.com/mehcode/config-rs) from 0.10.1 to 0.11.0.
- [Release notes](https://github.com/mehcode/config-rs/releases)
- [Changelog](https://github.com/mehcode/config-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mehcode/config-rs/commits/0.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-18 04:18:27 +00:00
4 changed files with 49 additions and 56 deletions

View File

@ -69,7 +69,7 @@ jobs:
strategy:
matrix:
# add windows-latest when it is clear why tests are failing
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-latest]
steps:
- name: Checkout sources

90
Cargo.lock generated
View File

@ -80,7 +80,7 @@ dependencies = [
"pin-project 1.0.5",
"rand 0.7.3",
"regex",
"serde 1.0.123",
"serde 1.0.125",
"serde_json",
"serde_urlencoded",
"sha-1",
@ -108,7 +108,7 @@ dependencies = [
"http",
"log",
"regex",
"serde 1.0.123",
"serde 1.0.125",
]
[[package]]
@ -247,7 +247,7 @@ dependencies = [
"mime",
"pin-project 1.0.5",
"regex",
"serde 1.0.123",
"serde 1.0.125",
"serde_json",
"serde_urlencoded",
"socket2",
@ -300,6 +300,12 @@ dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "anyhow"
version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
[[package]]
name = "arrayvec"
version = "0.5.2"
@ -342,7 +348,7 @@ dependencies = [
"mime",
"percent-encoding",
"rand 0.7.3",
"serde 1.0.123",
"serde 1.0.125",
"serde_json",
"serde_urlencoded",
]
@ -500,14 +506,14 @@ dependencies = [
[[package]]
name = "config"
version = "0.10.1"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3"
checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369"
dependencies = [
"lazy_static",
"nom",
"rust-ini",
"serde 1.0.123",
"serde 1.0.125",
"serde-hjson",
"serde_json",
"toml",
@ -943,7 +949,7 @@ dependencies = [
"openssl-probe",
"reqwest",
"ructe",
"serde 1.0.123",
"serde 1.0.125",
"serde_derive",
"serde_json",
"tempfile",
@ -1209,16 +1215,6 @@ dependencies = [
"vcpkg",
]
[[package]]
name = "linked-hash-map"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
dependencies = [
"serde 0.8.23",
"serde_test",
]
[[package]]
name = "linked-hash-map"
version = "0.5.4"
@ -1249,7 +1245,7 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
dependencies = [
"linked-hash-map 0.5.4",
"linked-hash-map",
]
[[package]]
@ -1809,7 +1805,7 @@ dependencies = [
"native-tls",
"percent-encoding",
"pin-project-lite 0.2.4",
"serde 1.0.123",
"serde 1.0.125",
"serde_urlencoded",
"tokio",
"tokio-tls",
@ -1874,6 +1870,12 @@ dependencies = [
"owned_ttf_parser",
]
[[package]]
name = "rustversion"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
[[package]]
name = "ryu"
version = "1.0.5"
@ -1942,9 +1944,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
[[package]]
name = "serde"
version = "1.0.123"
version = "1.0.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
dependencies = [
"serde_derive",
]
@ -1956,7 +1958,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8"
dependencies = [
"lazy_static",
"linked-hash-map 0.3.0",
"num-traits 0.1.43",
"regex",
"serde 0.8.23",
@ -1964,9 +1965,9 @@ dependencies = [
[[package]]
name = "serde_derive"
version = "1.0.123"
version = "1.0.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
dependencies = [
"proc-macro2",
"quote",
@ -1981,16 +1982,7 @@ checksum = "43535db9747a4ba938c0ce0a98cc631a46ebf943c9e1d604e091df6007620bf6"
dependencies = [
"itoa",
"ryu",
"serde 1.0.123",
]
[[package]]
name = "serde_test"
version = "0.8.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
dependencies = [
"serde 0.8.23",
"serde 1.0.125",
]
[[package]]
@ -2002,7 +1994,7 @@ dependencies = [
"form_urlencoded",
"itoa",
"ryu",
"serde 1.0.123",
"serde 1.0.125",
]
[[package]]
@ -2102,7 +2094,7 @@ checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
dependencies = [
"proc-macro2",
"quote",
"serde 1.0.123",
"serde 1.0.125",
"serde_derive",
"syn",
]
@ -2116,7 +2108,7 @@ dependencies = [
"base-x",
"proc-macro2",
"quote",
"serde 1.0.123",
"serde 1.0.125",
"serde_derive",
"serde_json",
"sha1",
@ -2306,7 +2298,7 @@ version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
dependencies = [
"serde 1.0.123",
"serde 1.0.125",
]
[[package]]
@ -2361,7 +2353,7 @@ dependencies = [
"chrono",
"gethostname",
"log",
"serde 1.0.123",
"serde 1.0.125",
"serde_json",
"tracing",
"tracing-core",
@ -2405,7 +2397,7 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
dependencies = [
"serde 1.0.123",
"serde 1.0.125",
"tracing-core",
]
@ -2420,7 +2412,7 @@ dependencies = [
"lazy_static",
"matchers",
"regex",
"serde 1.0.123",
"serde 1.0.125",
"serde_json",
"sharded-slab",
"smallvec",
@ -2557,17 +2549,17 @@ checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
[[package]]
name = "vergen"
version = "4.1.0"
version = "5.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7559dbf502657d16ddfdee53eea0827fc40ea7e3a53bc8b92d7317417cf9420e"
checksum = "dfbc87f9a7a9d61b15d51d1d3547284f67b6b4f1494ce3fc5814c101f35a5183"
dependencies = [
"bitflags",
"anyhow",
"chrono",
"enum-iterator",
"getset",
"git2",
"serde 1.0.123",
"serde_derive",
"rustversion",
"thiserror",
]
[[package]]
@ -2605,7 +2597,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55c0f7123de74f0dab9b7d00fd614e7b19349cd1e2f5252bbe9b1754b59433be"
dependencies = [
"cfg-if 1.0.0",
"serde 1.0.123",
"serde 1.0.125",
"serde_json",
"wasm-bindgen-macro",
]
@ -2750,5 +2742,5 @@ version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
dependencies = [
"linked-hash-map 0.5.4",
"linked-hash-map",
]

View File

@ -17,7 +17,7 @@ actix-rt = "1.1.1"
actix-web = "3.3.2"
badge = "0.3.0"
bytes = "1.0.1"
config = { version = "0.10.1", features = ["toml"] }
config = { version = "0.11.0", features = ["toml"] }
dotenv = "0.15.0"
futures = "0.3.13"
git2 = "0.13.17"
@ -25,7 +25,7 @@ lazy_static = "1.4.0"
number_prefix = "0.4.0"
openssl-probe = "0.1.2"
reqwest = "0.10.10"
serde = "1.0.123"
serde = "1.0.125"
serde_derive = "1.0.123"
serde_json = "1.0.63"
tracing = "0.1.25"
@ -37,7 +37,7 @@ tracing-subscriber = { version = "0.2.17", features = ["registry", "env-filter"]
[build-dependencies]
ructe = "0.13.0"
vergen = { version = "4.1.0", default-features = false, features = ["git"] }
vergen = { version = "5.1.0", default-features = false, features = ["git"] }
[dev-dependencies]
ructe = "0.13.0"

View File

@ -2,11 +2,12 @@ extern crate ructe;
extern crate vergen;
use ructe::Ructe;
use vergen::{gen, ConstantsFlags};
use vergen::{vergen, Config, ShaKind};
fn main() {
let flags = ConstantsFlags::SHA_SHORT;
gen(flags).expect("Unable to generate the cargo keys!");
let mut config = Config::default();
*config.git_mut().sha_kind_mut() = ShaKind::Short;
vergen(config).expect("Unable to generate static repo info");
Ructe::from_env()
.expect("ructe")
.compile_templates("templates")