Compare commits

...

84 Commits

Author SHA1 Message Date
87bae1bbd1 Fix blocking test
All checks were successful
continuous-integration/drone/push Build is passing
2023-06-13 11:09:54 +02:00
a64f55f362 Properly await the server future
All checks were successful
continuous-integration/drone/push Build is passing
2023-06-13 10:42:53 +02:00
9f3c2813ab Apply cargo fmt
All checks were successful
continuous-integration/drone/push Build is passing
2023-06-13 10:26:25 +02:00
4ce8c9e523 Disable pedantic lints for now
All checks were successful
continuous-integration/drone/push Build is passing
2023-06-13 10:23:09 +02:00
361eacbe1d Fix some pedantic lints 2023-06-13 10:22:37 +02:00
b07c732475 Remove usage of outdated actions
All checks were successful
continuous-integration/drone/push Build is passing
Closes #506
2023-06-13 09:59:33 +02:00
fddb3dd3d6 Merge pull request #627 from vbrandl/dependabot/cargo/serde-1.0.164
Bump serde from 1.0.163 to 1.0.164
2023-06-09 11:43:15 +02:00
f433f27229 Update Changelog 2023-06-09 05:00:52 +00:00
8d7e97ba11 Bump serde from 1.0.163 to 1.0.164
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.163 to 1.0.164.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.163...v1.0.164)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-09 05:00:40 +00:00
59ce8e2b57 Merge pull request #626 from vbrandl/dependabot/cargo/tempfile-3.6.0
Some checks failed
Security audit / security_audit (push) Failing after 21s
/ Clippy (push) Failing after 56s
/ Rustfmt (push) Successful in 46s
/ Test Suite (ubuntu-latest) (push) Failing after 40s
continuous-integration/drone/push Build is passing
Bump tempfile from 3.5.0 to 3.6.0
2023-06-07 09:41:55 +02:00
2e5dcf4ef5 Update Changelog 2023-06-07 05:01:42 +00:00
739162d2cd Bump tempfile from 3.5.0 to 3.6.0
Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.5.0 to 3.6.0.
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Stebalien/tempfile/compare/v3.5.0...v3.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-07 05:01:28 +00:00
4be1d9881b Merge pull request #625 from vbrandl/dependabot/cargo/tokio-1.28.2
Bump tokio from 1.28.1 to 1.28.2
2023-05-29 13:34:30 +02:00
f9e5175773 Update Changelog 2023-05-29 11:28:41 +00:00
96ca6bda04 Bump tokio from 1.28.1 to 1.28.2
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.28.1 to 1.28.2.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.28.1...tokio-1.28.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-29 11:28:25 +00:00
df96fcb091 Merge pull request #624 from vbrandl/dependabot/cargo/git2-0.17.2
Bump git2 from 0.17.1 to 0.17.2
2023-05-29 13:27:24 +02:00
1bae5a2b99 Update Changelog 2023-05-29 05:00:27 +00:00
5924f2ab23 Bump git2 from 0.17.1 to 0.17.2
Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.17.1 to 0.17.2.
- [Changelog](https://github.com/rust-lang/git2-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/git2-rs/compare/0.17.1...0.17.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-29 05:00:14 +00:00
202c9ba03e Merge pull request #623 from vbrandl/dependabot/cargo/tracing-actix-web-0.7.5
Bump tracing-actix-web from 0.7.4 to 0.7.5
2023-05-25 16:54:34 +02:00
8123b59e33 Update Changelog 2023-05-25 12:55:55 +00:00
7bb8e82c3b Bump tracing-actix-web from 0.7.4 to 0.7.5
Bumps [tracing-actix-web](https://github.com/LukeMathWalker/tracing-actix-web) from 0.7.4 to 0.7.5.
- [Commits](https://github.com/LukeMathWalker/tracing-actix-web/compare/v0.7.4...v0.7.5)

---
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-05-25 12:55:37 +00:00
5f1fc70a05 Merge pull request #622 from vbrandl/dependabot/cargo/vergen-8.2.1
Bump vergen from 8.2.0 to 8.2.1
2023-05-25 14:54:20 +02:00
d60462f7ce Update Changelog 2023-05-25 04:59:39 +00:00
4ce55c8e32 Bump vergen from 8.2.0 to 8.2.1
Bumps [vergen](https://github.com/rustyhorde/vergen) from 8.2.0 to 8.2.1.
- [Release notes](https://github.com/rustyhorde/vergen/releases)
- [Commits](https://github.com/rustyhorde/vergen/compare/8.2.0...8.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-25 04:59:25 +00:00
1a8db00ce4 Merge pull request #621 from vbrandl/dependabot/cargo/vergen-8.2.0
Bump vergen from 8.1.3 to 8.2.0
2023-05-22 13:14:23 +02:00
c304164935 Update Changelog 2023-05-22 05:02:23 +00:00
e2594b3c5b Bump vergen from 8.1.3 to 8.2.0
Bumps [vergen](https://github.com/rustyhorde/vergen) from 8.1.3 to 8.2.0.
- [Release notes](https://github.com/rustyhorde/vergen/releases)
- [Commits](https://github.com/rustyhorde/vergen/compare/8.1.3...8.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-22 05:02:05 +00:00
12c400e5b8 Merge pull request #619 from vbrandl/dependabot/cargo/reqwest-0.11.18
Bump reqwest from 0.11.17 to 0.11.18
2023-05-17 15:41:15 +02:00
745a9021cd Update Changelog 2023-05-17 13:28:43 +00:00
4bb0c8adc7 Bump reqwest from 0.11.17 to 0.11.18
Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.17 to 0.11.18.
- [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.17...v0.11.18)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-17 13:21:10 +00:00
e7cf23c625 Merge pull request #620 from vbrandl/feature/rerun-workflows
Some checks failed
/ Clippy (push) Failing after 1m8s
/ Test Suite (ubuntu-latest) (push) Failing after 42s
/ Rustfmt (push) Successful in 59s
Security audit / security_audit (push) Failing after 19s
continuous-integration/drone/push Build is passing
Use custom token to trigger reruns
2023-05-17 15:20:11 +02:00
78078132ce Use custom token to trigger reruns
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-17 15:15:49 +02:00
6aa253d44e Merge pull request #618 from vbrandl/dependabot/cargo/tokio-1.28.1
Some checks failed
Security audit / security_audit (push) Failing after 15s
/ Rustfmt (push) Successful in 44s
/ Test Suite (ubuntu-latest) (push) Failing after 44s
/ Clippy (push) Failing after 30s
continuous-integration/drone/push Build is passing
Bump tokio from 1.28.0 to 1.28.1
2023-05-11 13:35:05 +02:00
d461a8f6a1 Update Changelog 2023-05-11 11:21:01 +00:00
4847cc4f1f Bump tokio from 1.28.0 to 1.28.1
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.28.0 to 1.28.1.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.28.0...tokio-1.28.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-11 11:20:47 +00:00
bef518d594 Merge pull request #617 from vbrandl/dependabot/cargo/serde-1.0.163
Bump serde from 1.0.162 to 1.0.163
2023-05-11 13:20:07 +02:00
c22cc59924 Update Changelog 2023-05-11 11:06:57 +00:00
a4e28984ef Bump serde from 1.0.162 to 1.0.163
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.162 to 1.0.163.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.162...v1.0.163)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-11 11:06:41 +00:00
f4372c3248 Merge pull request #616 from vbrandl/dependabot/github_actions/actions/cache-3
Some checks failed
Security audit / security_audit (push) Failing after 14s
/ Rustfmt (push) Successful in 45s
/ Clippy (push) Failing after 39s
/ Test Suite (ubuntu-latest) (push) Failing after 40s
continuous-integration/drone/push Build is passing
Bump actions/cache from 2 to 3
2023-05-06 01:47:27 +02:00
e9554a20a7 Update Changelog 2023-05-05 23:36:33 +00:00
7862446e16 Bump actions/cache from 2 to 3
Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-05 23:36:18 +00:00
b4a7444442 Merge pull request #615 from vbrandl/feature/dependabot-auto-changelog
Some checks failed
Security audit / security_audit (push) Failing after 15s
/ Clippy (push) Failing after 42s
/ Test Suite (ubuntu-latest) (push) Failing after 43s
/ Rustfmt (push) Successful in 45s
continuous-integration/drone/push Build is passing
Update github actions using dependabot
2023-05-06 01:35:56 +02:00
66861cb4d3 Merge branch 'master' into feature/dependabot-auto-changelog 2023-05-06 01:32:13 +02:00
e6b1dfece8 Update github actions using dependabot
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-06 01:27:13 +02:00
6837660a79 Merge pull request #613 from vbrandl/dependabot/cargo/serde-1.0.162
Some checks failed
Security audit / security_audit (push) Failing after 17s
/ Rustfmt (push) Successful in 55s
/ Clippy (push) Failing after 50s
/ Test Suite (ubuntu-latest) (push) Failing after 41s
continuous-integration/drone/push Build is passing
chore(deps): Bump serde from 1.0.160 to 1.0.162
2023-05-06 01:18:14 +02:00
109886ad9a Update Changelog 2023-05-05 23:12:00 +00:00
dcadae98b6 chore(deps): Bump serde from 1.0.160 to 1.0.162
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.160 to 1.0.162.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.160...1.0.162)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-05 23:11:48 +00:00
4845826023 Merge pull request #614 from vbrandl/feature/dependabot-auto-changelog
Autogenerate changelog entry for dependabot PRs
2023-05-06 01:10:58 +02:00
ce9db6b4a7 Autogenerate changelog entry for dependabot PRs 2023-05-06 01:06:41 +02:00
24f2d43550 Add dependabot label to dependabot PRs 2023-05-06 01:06:32 +02:00
43bbf4d377 Merge pull request #612 from vbrandl/release/v0.35.0
Some checks failed
Security audit / security_audit (push) Failing after 13s
/ Rustfmt (push) Successful in 44s
/ Clippy (push) Failing after 43s
/ Test Suite (ubuntu-latest) (push) Failing after 43s
continuous-integration/drone/push Build is passing
Release v0.35.0
2023-05-04 13:00:54 +02:00
23d346d899 Bump version
Some checks failed
continuous-integration/drone/push Build is passing
Release / tests (push) Failing after 1m4s
Release / Publishing for ${{ matrix.os }} (linux, , ubuntu-latest, stable, x86_64-unknown-linux-gnu) (push) Has been skipped
Release / Publishing for ${{ matrix.os }} (macos, , macos-latest, stable, x86_64-apple-darwin) (push) Has been skipped
Release / Publishing for ${{ matrix.os }} (windows, .exe, windows-latest, stable, x86_64-pc-windows-msvc) (push) Has been skipped
Release / Update Changelog (push) Has been skipped
continuous-integration/drone/tag Build is passing
2023-05-04 12:38:13 +02:00
9186de3b53 Merge pull request #610 from vbrandl/dependabot/cargo/anyhow-1.0.71
Some checks failed
/ Rustfmt (push) Successful in 1m30s
/ Test Suite (ubuntu-latest) (push) Failing after 42s
/ Clippy (push) Failing after 57s
Security audit / security_audit (push) Failing after 17s
continuous-integration/drone/push Build is passing
chore(deps): Bump anyhow from 1.0.70 to 1.0.71
2023-05-03 09:51:05 +02:00
59b1ff41fc Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-03 09:37:57 +02:00
17016c39bf chore(deps): Bump anyhow from 1.0.70 to 1.0.71
Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.70 to 1.0.71.
- [Release notes](https://github.com/dtolnay/anyhow/releases)
- [Commits](https://github.com/dtolnay/anyhow/compare/1.0.70...1.0.71)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-03 07:24:27 +00:00
6041c5367b Merge pull request #609 from vbrandl/dependabot/cargo/reqwest-0.11.17
chore(deps): Bump reqwest from 0.11.16 to 0.11.17
2023-05-03 09:23:45 +02:00
5914f9d1ad Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-03 09:19:18 +02:00
ee069dd079 chore(deps): Bump reqwest from 0.11.16 to 0.11.17
Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.16 to 0.11.17.
- [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.16...v0.11.17)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-05-03 07:14:58 +00:00
82bc044321 Merge pull request #611 from vbrandl/dependency/downgrade-tracing
Downgrade yanked tracing 0.1.38 to 0.1.37
2023-05-03 09:14:09 +02:00
f4895d8c3b Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-03 09:07:14 +02:00
0d9be14496 Downgrade yanked tracing 0.1.38 to 0.1.37
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-03 09:06:00 +02:00
ef769c9d5a Merge pull request #608 from vbrandl/dependabot/cargo/vergen-8.1.3
chore(deps): Bump vergen from 8.1.1 to 8.1.3
2023-04-28 18:18:08 +02:00
bcf21906c8 Update changelog 2023-04-28 18:10:29 +02:00
abe637f878 chore(deps): Bump vergen from 8.1.1 to 8.1.3
Bumps [vergen](https://github.com/rustyhorde/vergen) from 8.1.1 to 8.1.3.
- [Release notes](https://github.com/rustyhorde/vergen/releases)
- [Commits](https://github.com/rustyhorde/vergen/compare/8.1.1...8.1.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-28 16:09:20 +00:00
bcc9d77622 Merge pull request #607 from vbrandl/dependabot/cargo/tracing-0.1.38
chore(deps): Bump tracing from 0.1.37 to 0.1.38
2023-04-28 18:08:33 +02:00
ac88f591b0 Update changelog 2023-04-28 18:02:29 +02:00
38cf6cbf6b chore(deps): Bump tracing from 0.1.37 to 0.1.38
Bumps [tracing](https://github.com/tokio-rs/tracing) from 0.1.37 to 0.1.38.
- [Release notes](https://github.com/tokio-rs/tracing/releases)
- [Commits](https://github.com/tokio-rs/tracing/compare/tracing-0.1.37...tracing-0.1.38)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-28 16:00:19 +00:00
1b06818a66 Merge pull request #605 from vbrandl/dependabot/cargo/tokio-1.28.0
chore(deps): Bump tokio from 1.27.0 to 1.28.0
2023-04-28 17:59:36 +02:00
7de5a420d2 Update changelog 2023-04-28 17:54:34 +02:00
b546ee6682 chore(deps): Bump tokio from 1.27.0 to 1.28.0
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.27.0 to 1.28.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.27.0...tokio-1.28.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-28 15:53:00 +00:00
19fb89b5a2 Merge pull request #604 from vbrandl/dependabot/cargo/tracing-subscriber-0.3.17
chore(deps): Bump tracing-subscriber from 0.3.16 to 0.3.17
2023-04-28 17:52:23 +02:00
90bb04386e Update changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-27 11:23:54 +02:00
eb35e745de chore(deps): Bump tracing-subscriber from 0.3.16 to 0.3.17
Bumps [tracing-subscriber](https://github.com/tokio-rs/tracing) from 0.3.16 to 0.3.17.
- [Release notes](https://github.com/tokio-rs/tracing/releases)
- [Commits](https://github.com/tokio-rs/tracing/compare/tracing-subscriber-0.3.16...tracing-subscriber-0.3.17)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-24 05:01:10 +00:00
41ecaa8ac9 Merge pull request #603 from vbrandl/dependabot/cargo/git2-0.17.1
Some checks failed
continuous-integration/drone/push Build is passing
Security audit / security_audit (push) Failing after 39s
/ Test Suite (ubuntu-latest) (push) Failing after 4s
/ Clippy (push) Failing after 39s
/ Rustfmt (push) Successful in 36s
chore(deps): Bump git2 from 0.17.0 to 0.17.1
2023-04-17 09:17:12 +02:00
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
037e520beb Use version from git-describe to better identify builds
All checks were successful
continuous-integration/drone/push Build is passing
2023-04-14 00:39:47 +02:00
119dcd4cff Merge pull request #599 from vbrandl/dependabot/cargo/h2-0.3.17
chore(deps): Bump h2 from 0.3.16 to 0.3.17
2023-04-14 00:33:37 +02:00
17 changed files with 315 additions and 233 deletions

View File

@ -10,3 +10,15 @@ updates:
- vbrandl
labels:
- dependencies
- dependabot
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'daily'
open-pull-requests-limit: 10
assignees:
- vbrandl
labels:
- dependabot
- dependencies

View File

@ -16,6 +16,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions-rs/audit-check@v1
- uses: rustsec/audit-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}

View File

@ -0,0 +1,26 @@
name: 'Dependabot Changelog'
on:
pull_request:
types:
- opened
- synchronize
- reopened
- ready_for_review
- labeled
- unlabeled
jobs:
changelog:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v3
with:
token: ${{ secrets.ACTION_TOKEN }}
- uses: dangoslen/dependabot-changelog-helper@v3
with:
activationLabel: 'dependabot'
- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: "Update Changelog"

View File

@ -42,7 +42,7 @@ jobs:
override: true
- name: Cache cargo registry, index and build directory
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.cargo/registry

View File

@ -16,18 +16,11 @@ jobs:
uses: actions/checkout@v3
- name: Install stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: true
components: rustfmt
uses: dtolnay/rust-toolchain@stable
- name: Check Formatting
uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
run: cargo fmt --all -- --check
clippy:
name: Clippy
@ -37,12 +30,7 @@ jobs:
uses: actions/checkout@v3
- name: Install stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: true
components: rustfmt
uses: dtolnay/rust-toolchain@stable
- name: Cache cargo registry, index and build directory
uses: actions/cache@v3
@ -54,10 +42,13 @@ jobs:
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Clippy Linting
uses: actions-rs/cargo@v1
with:
command: clippy
args: -- -D warnings
run: cargo clippy --all-features -- -Dclippy::all
# TODO
# run: cargo clippy --all-features -- -Dclippy::all -Dclippy::pedantic
- name: Clippy Test Linting
run: cargo clippy --tests -- -Dclippy::all
# TODO
# run: cargo clippy --tests -- -Dclippy::all -Dclippy::pedantic
test:
@ -74,11 +65,7 @@ jobs:
uses: actions/checkout@v3
- name: Install stable toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: true
uses: dtolnay/rust-toolchain@stable
- name: Cache cargo registry, index and build directory
uses: actions/cache@v3
@ -90,6 +77,4 @@ jobs:
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Run Tests
uses: actions-rs/cargo@v1
with:
command: test
run: cargo test

View File

@ -4,10 +4,40 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
### Dependencies
- Bump `serde` from 1.0.160 to 1.0.164 (#613, #617, #627)
- Bump `actions/cache` from 2 to 3 (#616)
- Bump `tokio` from 1.28.0 to 1.28.2 (#618, #625)
- Bump `reqwest` from 0.11.17 to 0.11.18 (#619)
- Bump `vergen` from 8.1.3 to 8.2.1 (#621, #622)
- Bump `tracing-actix-web` from 0.7.4 to 0.7.5 (#623)
- Bump `git2` from 0.17.1 to 0.17.2 (#624)
- Bump `tempfile` from 3.5.0 to 3.6.0 (#626)
## [0.35.0] 2023-05-04
* 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])
* Updated [`tracing-subscriber`](https://github.com/tokio-rs/tracing) from 0.3.16 to 0.3.17 ([#604])
* Updated [`tokio`](https://github.com/tokio-rs/tokio) from 1.27.0 to 1.28.0 ([#605])
* Updated [`tracing`](https://github.com/tokio-rs/tracing) from 0.1.37 to 0.1.38 ([#607])
* Updated [`vergen`](https://github.com/rustyhorde/vergen) from 8.1.1 to 8.1.3 ([#608])
* Downgrade yanked [`tracing`](https://github.com/tokio-rs/tracing) 0.1.38 to 0.1.37 ([#611])
* Updated [`reqwest`](https://github.com/seanmonstar/reqwest) from 0.11.16 to 0.11.17 ([#609])
* Updated [`anyhow`](https://github.com/dtolnay/anyhow) from 1.0.70 to 1.0.71 ([#610])
[#599]: https://github.com/vbrandl/hoc/pull/599
[#602]: https://github.com/vbrandl/hoc/pull/602
[#603]: https://github.com/vbrandl/hoc/pull/603
[#604]: https://github.com/vbrandl/hoc/pull/604
[#605]: https://github.com/vbrandl/hoc/pull/605
[#607]: https://github.com/vbrandl/hoc/pull/607
[#608]: https://github.com/vbrandl/hoc/pull/608
[#611]: https://github.com/vbrandl/hoc/pull/611
[#609]: https://github.com/vbrandl/hoc/pull/609
[#610]: https://github.com/vbrandl/hoc/pull/610
[SEC#11]: https://github.com/vbrandl/hoc/security/dependabot/11
@ -206,4 +236,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#502]: https://github.com/vbrandl/hoc/pull/502
[#503]: https://github.com/vbrandl/hoc/pull/503
[#504]: https://github.com/vbrandl/hoc/pull/504
[#508]: https://github.com/vbrandl/hoc/pull/508
[#508]: https://github.com/vbrandl/hoc/pull/508

331
Cargo.lock generated
View File

@ -24,7 +24,7 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe"
dependencies = [
"bitflags",
"bitflags 1.3.2",
"bytes",
"futures-core",
"futures-sink",
@ -47,7 +47,7 @@ dependencies = [
"actix-utils",
"ahash 0.8.3",
"base64 0.21.0",
"bitflags",
"bitflags 1.3.2",
"brotli",
"bytes",
"bytestring",
@ -272,9 +272,9 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.70"
version = "1.0.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
[[package]]
name = "arc-swap"
@ -362,6 +362,12 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24a6904aef64d73cf10ab17ebace7befb918b82164785cb89907993be7f83813"
[[package]]
name = "block-buffer"
version = "0.10.4"
@ -564,26 +570,6 @@ dependencies = [
"crypto-common",
]
[[package]]
name = "dirs"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
dependencies = [
"dirs-sys",
]
[[package]]
name = "dirs-sys"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
dependencies = [
"libc",
"redox_users",
"winapi",
]
[[package]]
name = "dlv-list"
version = "0.3.0"
@ -821,11 +807,11 @@ dependencies = [
[[package]]
name = "git2"
version = "0.16.1"
version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc"
checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
dependencies = [
"bitflags",
"bitflags 1.3.2",
"libc",
"libgit2-sys",
"log",
@ -836,9 +822,9 @@ dependencies = [
[[package]]
name = "gix"
version = "0.43.1"
version = "0.44.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c256ea71cc1967faaefdaad15f334146b7c806f12460dcafd3afed845c8c78dd"
checksum = "6bf41b61f7df395284f7a579c0fa1a7e012c5aede655174d4e91299ef1cac643"
dependencies = [
"gix-actor",
"gix-attributes",
@ -848,9 +834,11 @@ dependencies = [
"gix-diff",
"gix-discover",
"gix-features",
"gix-fs",
"gix-glob",
"gix-hash",
"gix-hashtable",
"gix-ignore",
"gix-index",
"gix-lock",
"gix-mailmap",
@ -866,6 +854,7 @@ dependencies = [
"gix-tempfile",
"gix-traverse",
"gix-url",
"gix-utils",
"gix-validate",
"gix-worktree",
"log",
@ -878,9 +867,9 @@ dependencies = [
[[package]]
name = "gix-actor"
version = "0.19.0"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc22b0cdc52237667c301dd7cdc6ead8f8f73c9f824e9942c8ebd6b764f6c0bf"
checksum = "848efa0f1210cea8638f95691c82a46f98a74b9e3524f01d4955ebc25a8f84f3"
dependencies = [
"bstr",
"btoi",
@ -892,24 +881,26 @@ dependencies = [
[[package]]
name = "gix-attributes"
version = "0.10.0"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2231a25934a240d0a4b6f4478401c73ee81d8be52de0293eedbc172334abf3e1"
checksum = "3015baa01ad2122fbcaab7863c857a603eb7b7ec12ac8141207c42c6439805e2"
dependencies = [
"bstr",
"gix-features",
"gix-glob",
"gix-path",
"gix-quote",
"kstring",
"log",
"smallvec",
"thiserror",
"unicode-bom",
]
[[package]]
name = "gix-bitmap"
version = "0.2.2"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "024bca0c7187517bda5ea24ab148c9ca8208dd0c3e2bea88cdb2008f91791a6d"
checksum = "55a95f4942360766c3880bdb2b4b57f1ef73b190fc424755e7fdf480430af618"
dependencies = [
"thiserror",
]
@ -934,9 +925,9 @@ dependencies = [
[[package]]
name = "gix-config"
version = "0.20.1"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fbad5ce54a8fc997acc50febd89ec80fa6e97cb7f8d0654cb229936407489d8"
checksum = "1d252a0eddb6df74600d3d8872dc9fe98835a7da43110411d705b682f49d4ac1"
dependencies = [
"bstr",
"gix-config-value",
@ -956,11 +947,11 @@ dependencies = [
[[package]]
name = "gix-config-value"
version = "0.10.2"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d09154c0c8677e4da0ec35e896f56ee3e338e741b9599fae06075edd83a4081c"
checksum = "786861e84a5793ad5f863d846de5eb064cd23b87e61ad708c8c402608202e7be"
dependencies = [
"bitflags",
"bitflags 2.2.1",
"bstr",
"gix-path",
"libc",
@ -969,9 +960,9 @@ dependencies = [
[[package]]
name = "gix-credentials"
version = "0.12.0"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "750b684197374518ea057e0a0594713e07683faa0a3f43c0f93d97f64130ad8d"
checksum = "4874a4fc11ffa844a3c2b87a66957bda30a73b577ef1acf15ac34df5745de5ff"
dependencies = [
"bstr",
"gix-command",
@ -985,9 +976,9 @@ dependencies = [
[[package]]
name = "gix-date"
version = "0.4.3"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b96271912ce39822501616f177dea7218784e6c63be90d5f36322ff3a722aae2"
checksum = "99056f37270715f5c7584fd8b46899a2296af9cae92463bf58b8bd1f5a78e553"
dependencies = [
"bstr",
"itoa",
@ -997,9 +988,9 @@ dependencies = [
[[package]]
name = "gix-diff"
version = "0.28.1"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "103a0fa79b0d438f5ecb662502f052e530ace4fe1fe8e1c83c0c6da76d728e67"
checksum = "644a0f2768bc42d7a69289ada80c9e15c589caefc6a315d2307202df83ed1186"
dependencies = [
"gix-hash",
"gix-object",
@ -1009,9 +1000,9 @@ dependencies = [
[[package]]
name = "gix-discover"
version = "0.16.2"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6eba8ba458cb8f4a6c33409b0fe650b1258655175a7ffd1d24fafd3ed31d880b"
checksum = "5012710ebdecf6193c6866d6409a3b702a4aa0d78c605bc343590b44ab9962a1"
dependencies = [
"bstr",
"dunce",
@ -1024,9 +1015,9 @@ dependencies = [
[[package]]
name = "gix-features"
version = "0.28.1"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b76f9a80f6dd7be66442ae86e1f534effad9546676a392acc95e269d0c21c22"
checksum = "cf69b0f5c701cc3ae22d3204b671907668f6437ca88862d355eaf9bc47a4f897"
dependencies = [
"crc32fast",
"flate2",
@ -1040,20 +1031,31 @@ dependencies = [
]
[[package]]
name = "gix-glob"
version = "0.5.5"
name = "gix-fs"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993"
checksum = "9b37a1832f691fdc09910bd267f9a2e413737c1f9ec68c6e31f9e802616278a9"
dependencies = [
"bitflags",
"gix-features",
]
[[package]]
name = "gix-glob"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c07c98204529ac3f24b34754540a852593d2a4c7349008df389240266627a72a"
dependencies = [
"bitflags 2.2.1",
"bstr",
"gix-features",
"gix-path",
]
[[package]]
name = "gix-hash"
version = "0.10.4"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a258595457bc192d1f1c59d0d168a1e34e2be9b97a614e14995416185de41a7"
checksum = "078eec3ac2808cc03f0bddd2704cb661da5c5dc33b41a9d7947b141d499c7c42"
dependencies = [
"hex",
"thiserror",
@ -1061,9 +1063,9 @@ dependencies = [
[[package]]
name = "gix-hashtable"
version = "0.1.3"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4e55e40dfd694884f0eb78796c5bddcf2f8b295dace47039099dd7e76534973"
checksum = "afebb85691c6a085b114e01a27f4a61364519298c5826cb87a45c304802299bc"
dependencies = [
"gix-hash",
"hashbrown 0.13.2",
@ -1071,12 +1073,24 @@ dependencies = [
]
[[package]]
name = "gix-index"
version = "0.15.1"
name = "gix-ignore"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "717ab601ece7921f59fe86849dbe27d44a46ebb883b5885732c4f30df4996177"
checksum = "ba205b6df563e2906768bb22834c82eb46c5fdfcd86ba2c347270bc8309a05b2"
dependencies = [
"bitflags",
"bstr",
"gix-glob",
"gix-path",
"unicode-bom",
]
[[package]]
name = "gix-index"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa282756760f79c401d4f4f42588fbb4aa27bbb4b0830f3b4d3480c21a4ac5a7"
dependencies = [
"bitflags 2.2.1",
"bstr",
"btoi",
"filetime",
@ -1105,9 +1119,9 @@ dependencies = [
[[package]]
name = "gix-mailmap"
version = "0.11.0"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b66aea5e52875cd4915f4957a6f4b75831a36981e2ec3f5fad9e370e444fe1a"
checksum = "e8856cec3bdc3610c06970d28b6cb20a0c6621621cf9a8ec48cbd23f2630f362"
dependencies = [
"bstr",
"gix-actor",
@ -1116,9 +1130,9 @@ dependencies = [
[[package]]
name = "gix-object"
version = "0.28.0"
version = "0.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8df068db9180ee935fbb70504848369e270bdcb576b05c0faa8b9fd3b86fc017"
checksum = "c9bb30ce0818d37096daa29efe361a4bc6dd0b51a5726598898be7e9a40a01e1"
dependencies = [
"bstr",
"btoi",
@ -1135,9 +1149,9 @@ dependencies = [
[[package]]
name = "gix-odb"
version = "0.43.1"
version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e83af2e3e36005bfe010927f0dff41fb5acc3e3d89c6f1174135b3a34086bda2"
checksum = "bca2f324aa67672b6d0f2c0fa93f96eb6a7029d260e4c1df5dce3c015f5e5add"
dependencies = [
"arc-swap",
"gix-features",
@ -1153,9 +1167,9 @@ dependencies = [
[[package]]
name = "gix-pack"
version = "0.33.2"
version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9401911c7fe032ad7b31c6a6b5be59cb283d1d6c999417a8215056efe6d635f3"
checksum = "164a515900a83257ae4aa80e741655bee7a2e39113fb535d7a5ac623b445ff20"
dependencies = [
"clru",
"gix-chunk",
@ -1175,24 +1189,26 @@ dependencies = [
[[package]]
name = "gix-path"
version = "0.7.3"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32370dce200bb951df013e03dff35b4233fc7a89458642b047629b91734a7e19"
checksum = "4fc78f47095a0c15aea0e66103838f0748f4494bf7a9555dfe0f00425400396c"
dependencies = [
"bstr",
"home",
"once_cell",
"thiserror",
]
[[package]]
name = "gix-prompt"
version = "0.3.3"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f3034d4d935aef2c7bf719aaa54b88c520e82413118d886ae880a31d5bdee57"
checksum = "330d11fdf88fff3366c2491efde2f3e454958efe7d5ddf60272e8fb1d944bb01"
dependencies = [
"gix-command",
"gix-config-value",
"nix",
"parking_lot",
"rustix",
"thiserror",
]
@ -1209,12 +1225,13 @@ dependencies = [
[[package]]
name = "gix-ref"
version = "0.27.2"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4e909396ed3b176823991ccc391c276ae2a015e54edaafa3566d35123cfac9d"
checksum = "b8212ecfe41815a2f1b059d82171d6276758cfac5506a5e0f04ad45ef0b1924a"
dependencies = [
"gix-actor",
"gix-features",
"gix-fs",
"gix-hash",
"gix-lock",
"gix-object",
@ -1228,9 +1245,9 @@ dependencies = [
[[package]]
name = "gix-refspec"
version = "0.9.0"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aba332462bda2e8efeae4302b39a6ed01ad56ef772fd5b7ef197cf2798294d65"
checksum = "0a6ea733820df67e4cd7797deb12727905824d8f5b7c59d943c456d314475892"
dependencies = [
"bstr",
"gix-hash",
@ -1242,9 +1259,9 @@ dependencies = [
[[package]]
name = "gix-revision"
version = "0.12.2"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c6f6ff53f888858afc24bf12628446a14279ceec148df6194481f306f553ad2"
checksum = "810f35e9afeccca999d5d348b239f9c162353127d2e13ff3240e31b919e35476"
dependencies = [
"bstr",
"gix-date",
@ -1256,12 +1273,11 @@ dependencies = [
[[package]]
name = "gix-sec"
version = "0.6.2"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47"
checksum = "794520043d5a024dfeac335c6e520cb616f6963e30dab995892382e998c12897"
dependencies = [
"bitflags",
"dirs",
"bitflags 2.2.1",
"gix-path",
"libc",
"windows",
@ -1283,9 +1299,9 @@ dependencies = [
[[package]]
name = "gix-traverse"
version = "0.24.0"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd9a4a07bb22168dc79c60e1a6a41919d198187ca83d8a5940ad8d7122a45df3"
checksum = "a5be1e807f288c33bb005075111886cceb43ed8a167b3182a0f62c186e2a0dd1"
dependencies = [
"gix-hash",
"gix-hashtable",
@ -1295,9 +1311,9 @@ dependencies = [
[[package]]
name = "gix-url"
version = "0.16.0"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6a22b4b32ad14d68f7b7fb6458fa58d44b01797d94c1b8f4db2d9c7b3c366b5"
checksum = "dfc77f89054297cc81491e31f1bab4027e554b5ef742a44bd7035db9a0f78b76"
dependencies = [
"bstr",
"gix-features",
@ -1307,6 +1323,15 @@ dependencies = [
"url",
]
[[package]]
name = "gix-utils"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c10b69beac219acb8df673187a1f07dde2d74092f974fb3f9eb385aeb667c909"
dependencies = [
"fastrand",
]
[[package]]
name = "gix-validate"
version = "0.7.4"
@ -1319,15 +1344,18 @@ dependencies = [
[[package]]
name = "gix-worktree"
version = "0.15.2"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54ec9a000b4f24af706c3cc680c7cda235656cbe3216336522f5692773b8a301"
checksum = "10bf56a1f5037d84293ea6cece61d9f27c4866b1e13c1c95f37cf56b7da7af25"
dependencies = [
"bstr",
"filetime",
"gix-attributes",
"gix-features",
"gix-fs",
"gix-glob",
"gix-hash",
"gix-ignore",
"gix-index",
"gix-object",
"gix-path",
@ -1392,7 +1420,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "hoc"
version = "0.34.0"
version = "0.35.0"
dependencies = [
"actix-rt",
"actix-web",
@ -1614,6 +1642,15 @@ dependencies = [
"serde",
]
[[package]]
name = "kstring"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747"
dependencies = [
"static_assertions",
]
[[package]]
name = "language-tags"
version = "0.3.2"
@ -1628,15 +1665,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.141"
version = "0.2.142"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
[[package]]
name = "libgit2-sys"
version = "0.14.2+1.5.1"
version = "0.15.2+1.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4"
checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa"
dependencies = [
"cc",
"libc",
@ -1648,9 +1685,9 @@ dependencies = [
[[package]]
name = "libssh2-sys"
version = "0.2.23"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
dependencies = [
"cc",
"libc",
@ -1680,9 +1717,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linux-raw-sys"
version = "0.3.1"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c"
[[package]]
name = "local-channel"
@ -1802,18 +1839,6 @@ dependencies = [
"tempfile",
]
[[package]]
name = "nix"
version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
dependencies = [
"bitflags",
"cfg-if",
"libc",
"static_assertions",
]
[[package]]
name = "nom"
version = "7.1.3"
@ -1880,7 +1905,7 @@ version = "0.10.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1"
dependencies = [
"bitflags",
"bitflags 1.3.2",
"cfg-if",
"foreign-types",
"libc",
@ -2132,7 +2157,7 @@ version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
"bitflags",
"bitflags 1.3.2",
]
[[package]]
@ -2141,18 +2166,7 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
dependencies = [
"bitflags",
]
[[package]]
name = "redox_users"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
"getrandom",
"redox_syscall 0.2.16",
"thiserror",
"bitflags 1.3.2",
]
[[package]]
@ -2183,9 +2197,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "reqwest"
version = "0.11.16"
version = "0.11.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"
checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
dependencies = [
"base64 0.21.0",
"bytes",
@ -2225,7 +2239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
dependencies = [
"base64 0.13.1",
"bitflags",
"bitflags 1.3.2",
"serde",
]
@ -2264,11 +2278,11 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.37.11"
version = "0.37.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"
checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece"
dependencies = [
"bitflags",
"bitflags 1.3.2",
"errno",
"io-lifetimes",
"libc",
@ -2318,7 +2332,7 @@ version = "2.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
dependencies = [
"bitflags",
"bitflags 1.3.2",
"core-foundation",
"core-foundation-sys",
"libc",
@ -2343,18 +2357,18 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
[[package]]
name = "serde"
version = "1.0.160"
version = "1.0.164"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.160"
version = "1.0.164"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
dependencies = [
"proc-macro2",
"quote",
@ -2495,15 +2509,16 @@ dependencies = [
[[package]]
name = "tempfile"
version = "3.5.0"
version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
dependencies = [
"autocfg",
"cfg-if",
"fastrand",
"redox_syscall 0.3.5",
"rustix",
"windows-sys 0.45.0",
"windows-sys 0.48.0",
]
[[package]]
@ -2582,9 +2597,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
version = "1.27.0"
version = "1.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
dependencies = [
"autocfg",
"bytes",
@ -2594,7 +2609,7 @@ dependencies = [
"pin-project-lite",
"signal-hook-registry",
"socket2",
"windows-sys 0.45.0",
"windows-sys 0.48.0",
]
[[package]]
@ -2651,9 +2666,9 @@ dependencies = [
[[package]]
name = "tracing-actix-web"
version = "0.7.4"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2def0ffabc0116481e14e82cf705fef814f5178171d445b6790137ff8a85a73"
checksum = "ce52ffaf2d544e317d3bef63f49a6a22022866505fa4840a4339b1756834a2a9"
dependencies = [
"actix-web",
"pin-project",
@ -2723,9 +2738,9 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
version = "0.3.16"
version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
dependencies = [
"matchers",
"nu-ansi-term",
@ -2771,9 +2786,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-bom"
version = "1.1.4"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63ec69f541d875b783ca40184d655f2927c95f0bffd486faa83cd3ac3529ec32"
checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552"
[[package]]
name = "unicode-ident"
@ -2824,9 +2839,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "vergen"
version = "8.1.1"
version = "8.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1b86a8af1dedf089b1c78338678e4c7492b6045649042d94faf19690499d236"
checksum = "8b3c89c2c7e50f33e4d35527e5bf9c11d6d132226dbbd1753f0fbe9f19ef88c6"
dependencies = [
"anyhow",
"gix",
@ -2975,17 +2990,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
version = "0.43.0"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244"
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
"windows_aarch64_gnullvm 0.42.2",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm 0.42.2",
"windows_x86_64_msvc 0.42.2",
"windows-targets 0.48.0",
]
[[package]]

View File

@ -1,6 +1,6 @@
[package]
name = "hoc"
version = "0.34.0"
version = "0.35.0"
authors = ["Valentin Brandl <vbrandl@riseup.net>"]
edition = "2021"
build = "src/build.rs"
@ -20,29 +20,29 @@ bytes = "1.4.0"
config = { version = "0.13.3", features = ["toml"] }
dotenvy = "0.15.7"
futures = "0.3.27"
git2 = "0.16.1"
git2 = "0.17.2"
lazy_static = "1.4.0"
mime = "0.3"
number_prefix = "0.4.0"
openssl-probe = "0.1.5"
reqwest = "0.11.16"
serde = "1.0.158"
reqwest = "0.11.18"
serde = "1.0.164"
serde_derive = "1.0.137"
serde_json = "1.0.94"
tracing = "0.1.37"
tracing-actix-web = "0.7.3"
tracing-actix-web = "0.7.5"
tracing-bunyan-formatter = "0.3.6"
tracing-futures = "0.2.5"
tracing-log = "0.1.3"
tracing-subscriber = { version = "0.3.16", features = ["registry", "env-filter"] }
tracing-subscriber = { version = "0.3.17", features = ["registry", "env-filter"] }
[build-dependencies]
anyhow = "1.0.70"
anyhow = "1.0.71"
ructe = { version = "0.16.1", features = ["mime03"] }
vergen = { version = "8.1.1", default-features = false, features = ["git", "gitoxide"] }
vergen = { version = "8.2.1", default-features = false, features = ["git", "gitoxide"] }
[dev-dependencies]
awc = "3.1.1"
ructe = "0.16.1"
tempfile = "3.5.0"
tokio = "1.27.0"
tempfile = "3.6.0"
tokio = "1.28.2"

View File

@ -36,10 +36,10 @@ impl<'a> CacheState<'a> {
trace!("Reading cache");
if path.as_ref().exists() {
let cache: Cache = serde_json::from_reader(BufReader::new(File::open(path)?))?;
Ok(cache
.entries
.get(branch)
.map(|c| {
Ok(cache.entries.get(branch).map_or_else(
// TODO: get rid of clone
|| CacheState::NoneForBranch(cache.clone()),
|c| {
if c.head == head {
trace!("Cache is up to date");
CacheState::Current {
@ -56,9 +56,8 @@ impl<'a> CacheState<'a> {
cache: cache.clone(),
}
}
})
// TODO: get rid of clone
.unwrap_or_else(|| CacheState::NoneForBranch(cache.clone())))
},
))
} else {
Ok(CacheState::No)
}

View File

@ -18,6 +18,12 @@ pub struct Settings {
}
impl Settings {
/// Load the configuration from file and environment.
///
/// # Errors
///
/// * File cannot be read or parsed
/// * Environment variables cannot be parsed
pub fn load() -> Result<Self, ConfigError> {
Config::builder()
.add_source(File::with_name("hoc.toml").required(false))

View File

@ -22,7 +22,7 @@ use crate::{
cache::CacheState,
config::Settings,
error::{Error, Result},
service::{Bitbucket, FormService, GitHub, Gitlab, Service, Sourcehut},
service::{Bitbucket, FormValue, GitHub, Gitlab, Service, Sourcehut},
statics::{CLIENT, VERSION_INFO},
template::{RepoGeneratorInfo, RepoInfo},
};
@ -53,7 +53,7 @@ include!(concat!(env!("OUT_DIR"), "/templates.rs"));
#[derive(Deserialize, Serialize)]
struct GeneratorForm<'a> {
service: FormService,
service: FormValue,
user: Cow<'a, str>,
repo: Cow<'a, str>,
branch: Option<Cow<'a, str>>,
@ -309,7 +309,7 @@ pub(crate) async fn json_hoc<T: Service>(
let branch = branch.branch.as_deref().unwrap_or("master");
let rc_clone = repo_count.clone();
let mapper = move |r| match r {
HocResult::NotFound => p404(rc_clone),
HocResult::NotFound => p404(&rc_clone),
HocResult::Hoc {
hoc, head, commits, ..
} => Ok(HttpResponse::Ok().json(JsonResponse {
@ -345,7 +345,7 @@ pub(crate) async fn calculate_hoc<T: Service>(
let rc_clone = repo_count.clone();
let label = query.label.clone();
let mapper = move |r| match r {
HocResult::NotFound => p404(rc_clone),
HocResult::NotFound => p404(&rc_clone),
HocResult::Hoc { hoc_pretty, .. } => {
let badge_opt = BadgeOptions {
subject: label,
@ -386,7 +386,7 @@ async fn overview<T: Service>(
let base_url = state.settings.base_url.clone();
let rc_clone = repo_count.clone();
let mapper = move |r| match r {
HocResult::NotFound => p404(rc_clone),
HocResult::NotFound => p404(&rc_clone),
HocResult::Hoc {
hoc,
commits,
@ -413,7 +413,7 @@ async fn overview<T: Service>(
VERSION_INFO,
rc_clone.load(Ordering::Relaxed),
repo_info,
label,
&label,
)?;
Ok(HttpResponse::Ok().content_type("text/html").body(buf))
@ -423,11 +423,13 @@ async fn overview<T: Service>(
}
#[get("/health_check")]
#[allow(clippy::unused_async)]
async fn health_check() -> HttpResponse {
HttpResponse::Ok().finish()
}
#[get("/")]
#[allow(clippy::unused_async)]
async fn index(
state: web::Data<State>,
repo_count: web::Data<AtomicUsize>,
@ -443,6 +445,7 @@ async fn index(
}
#[post("/generate")]
#[allow(clippy::unused_async)]
async fn generate(
params: web::Form<GeneratorForm<'_>>,
state: web::Data<State>,
@ -470,20 +473,22 @@ async fn generate(
Ok(HttpResponse::Ok().content_type("text/html").body(buf))
}
fn p404(repo_count: web::Data<AtomicUsize>) -> Result<HttpResponse> {
fn p404(repo_count: &web::Data<AtomicUsize>) -> Result<HttpResponse> {
let mut buf = Vec::new();
templates::p404_html(&mut buf, VERSION_INFO, repo_count.load(Ordering::Relaxed))?;
Ok(HttpResponse::NotFound().content_type("text/html").body(buf))
}
#[allow(clippy::unused_async)]
async fn async_p404(repo_count: web::Data<AtomicUsize>) -> Result<HttpResponse> {
p404(repo_count)
p404(&repo_count)
}
/// A duration to add to current time for a far expires header.
static FAR: Duration = Duration::from_secs(180 * 24 * 60 * 60);
#[get("/static/{filename}")]
#[allow(clippy::unused_async)]
async fn static_file(
path: web::Path<String>,
repo_count: web::Data<AtomicUsize>,
@ -496,11 +501,11 @@ async fn static_file(
.content_type(data.mime.clone())
.body(data.content)
})
.map(Result::Ok)
.unwrap_or_else(|| p404(repo_count))
.map_or_else(|| p404(&repo_count), Result::Ok)
}
#[get("/favicon.ico")]
#[allow(clippy::unused_async)]
async fn favicon32() -> HttpResponse {
let data = &template_statics::favicon32_png;
HttpResponse::Ok()
@ -508,6 +513,7 @@ async fn favicon32() -> HttpResponse {
.body(data.content)
}
#[allow(clippy::unused_async)]
async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Result<Server> {
let workers = settings.workers;
let repo_count =
@ -536,6 +542,11 @@ async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Res
.run())
}
/// Start the server.
///
/// # Errors
///
/// * server cannot bind to `listener`
pub async fn run(listener: TcpListener, settings: Settings) -> std::io::Result<Server> {
let span = info_span!("hoc", version = env!("CARGO_PKG_VERSION"));
let _ = span.enter();

View File

@ -29,7 +29,7 @@ pub(crate) trait Service: Sized + 'static {
}
#[derive(Deserialize, Serialize, Clone, Copy)]
pub enum FormService {
pub enum FormValue {
#[serde(rename = "github")]
GitHub,
#[serde(rename = "gitlab")]
@ -40,22 +40,22 @@ pub enum FormService {
Sourcehut,
}
impl FormService {
impl FormValue {
pub(crate) fn url(&self) -> &str {
match self {
FormService::GitHub => "github.com",
FormService::Gitlab => "gitlab.com",
FormService::Bitbucket => "bitbucket.org",
FormService::Sourcehut => "git.sr.ht",
FormValue::GitHub => "github.com",
FormValue::Gitlab => "gitlab.com",
FormValue::Bitbucket => "bitbucket.org",
FormValue::Sourcehut => "git.sr.ht",
}
}
pub(crate) fn service(&self) -> &str {
match self {
FormService::GitHub => "github",
FormService::Gitlab => "gitlab",
FormService::Bitbucket => "bitbucket",
FormService::Sourcehut => "sourcehut",
FormValue::GitHub => "github",
FormValue::Gitlab => "gitlab",
FormValue::Bitbucket => "bitbucket",
FormValue::Sourcehut => "sourcehut",
}
}
}

View File

@ -1,3 +1,4 @@
#[derive(Clone, Copy)]
pub struct VersionInfo<'a> {
pub commit: &'a str,
pub version: &'a str,

View File

@ -1,5 +1,6 @@
use crate::service::FormService;
use crate::service::FormValue;
#[derive(Clone, Copy)]
pub struct RepoInfo<'a> {
pub commit_url: &'a str,
pub commits: u64,
@ -13,7 +14,7 @@ pub struct RepoInfo<'a> {
}
pub struct RepoGeneratorInfo<'a> {
pub service: FormService,
pub service: FormValue,
pub user: &'a str,
pub repo: &'a str,
pub branch: &'a str,

View File

@ -1,4 +1,4 @@
@use super::statics::*;
@use super::statics::tacit_css_min_css;
@use crate::statics::VersionInfo;
@(title: &str, header: &str, content: Content, version_info: VersionInfo, repo_count: usize)

View File

@ -2,7 +2,7 @@
@use crate::statics::VersionInfo;
@use crate::template::RepoInfo;
@(version_info: VersionInfo, repo_count: usize, repo_info: RepoInfo, label: String)
@(version_info: VersionInfo, repo_count: usize, repo_info: RepoInfo, label: &str)
@:base_html("Hits-of-Code Badges", "Overview", {

View File

@ -38,6 +38,8 @@ pub async fn spawn_app() -> TestApp {
.await
.expect("Failed to bind address");
#[allow(clippy::let_underscore_future)]
// don't await so the test server runs in the background
let _ = tokio::spawn(server);
TestApp {