Skip to content

Commit

Permalink
Merge branch 'main' into slash
Browse files Browse the repository at this point in the history
# Conflicts:
#	Cargo.toml
#	sdk/Cargo.toml
  • Loading branch information
zifeo committed Jan 13, 2024
2 parents 59462d0 + 7f107a1 commit 3f73d25
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr-title-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: thehanimo/pr-title-checker@v1.4.0
- uses: thehanimo/pr-title-checker@v1.4.1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14 changes: 13 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,37 @@ resolver = "2"

[package]
name = "lade"
version = "0.9.1"
version = "0.9.2-beta.1"
edition = "2021"
description = "Automatically load secrets from your preferred vault as environment variables, and clear them once your shell command is over."
license = "MPL-2.0"

[dependencies]
<<<<<<< HEAD
anyhow = "1.0.79"
=======
anyhow = "1.0.75"
>>>>>>> main
self_update = { version = "0.39.0", features = [
"archive-tar",
"archive-zip",
"compression-flate2",
"compression-zip-deflate",
"compression-zip-bzip2",
] }
<<<<<<< HEAD
serde = { version = "1.0.195", features = ["derive"] }
serde_yaml = "0.9.30"
clap = { version = "4.4.15", features = ["derive"] }
regex = "1.10.2"
lade-sdk = { path = "./sdk", version = "0.9.1" }
=======
serde = { version = "1.0.188", features = ["derive"] }
serde_yaml = "0.9.25"
clap = { version = "4.4.6", features = ["derive"] }
regex = "1.9.6"
lade-sdk = { path = "./sdk", version = "0.9.2-beta.1" }
>>>>>>> main
tokio = { version = "1", features = ["full"] }
indexmap = { version = "2.1.0", features = ["serde"] }
clap-verbosity-flag = "2.1.1"
Expand Down
2 changes: 1 addition & 1 deletion sdk/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lade-sdk"
version = "0.9.1"
version = "0.9.2-beta.1"
edition = "2021"
description = "Lade SDK"
license = "MPL-2.0"
Expand Down

0 comments on commit 3f73d25

Please sign in to comment.