Skip to content

Commit

Permalink
Merge branch 'main' into release/rustic_core-0.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
simonsan authored Sep 15, 2023
2 parents fc95875 + cb7d888 commit 5ef0339
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
contents: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
- uses: chainguard-dev/actions/setup-gitsign@main
- uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2
- name: Install cargo-release
uses: taiki-e/install-action@9a29ce630c67077a359246f3e4f84941e05f28b5 # v1
uses: taiki-e/install-action@0163f6cf65d9b9bb0e5d1f0e3ae19280a06be4b0 # v2
with:
tool: cargo-release
- uses: cargo-bins/release-pr@deeacca5a38bacc74a3f444b798f4b9bba40f6ad # v2
Expand Down
65 changes: 51 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ toml = { workspace = true }

[target.'cfg(not(windows))'.dependencies]
sha2 = { version = "0.10", features = ["asm"] }
libc = "0.2.147"
libc = "0.2.148"

[target.'cfg(windows)'.dependencies]
# unfortunately, the asm extensions do not build on MSVC, see https://github.com/RustCrypto/asm-hashes/issues/17
Expand Down Expand Up @@ -180,7 +180,7 @@ integer-sqrt = "0.1"
binrw = "0.11"
hex = { version = "0.4", features = ["serde"] }
serde = { version = "1", features = ["serde_derive"] }
serde_with = { version = "3.2", features = ["base64"] }
serde_with = { version = "3.3", features = ["base64"] }
serde_json = "1"
serde-aux = "4"

Expand All @@ -205,8 +205,8 @@ bytes = "1"
chrono = { version = "0.4", default-features = false, features = ["clock", "serde"] }
zstd = "0.12"
enum-map = "2"
enum-map-derive = "0.13"
rhai = { version = "1.15", features = ["sync", "serde", "no_optimize", "no_module", "no_custom_syntax", "only_i64"] }
enum-map-derive = "0.14"
rhai = { version = "1.16", features = ["sync", "serde", "no_optimize", "no_module", "no_custom_syntax", "only_i64"] }
simplelog = "0.12"
comfy-table = "7.0.1"

Expand Down Expand Up @@ -236,7 +236,7 @@ quickcheck = "1"
quickcheck_macros = "1"
tempfile = "3.8"
pretty_assertions = "1.4"
toml = "0.7"
toml = "0.8"
dircmp = "0.2"

# cargo-binstall support
Expand Down

0 comments on commit 5ef0339

Please sign in to comment.