Skip to content

Commit

Permalink
fix: makefile and update dependences
Browse files Browse the repository at this point in the history
  • Loading branch information
NexVeridian committed Sep 26, 2024
1 parent 47cde83 commit 57534b8
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 26 deletions.
16 changes: 8 additions & 8 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
anyhow = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
surrealdb = { version = "2.0.1", features = ["protocol-http", "kv-mem"] }
surrealdb = { version = "2.0.2", features = ["protocol-http", "kv-mem"] }
tokio = { version = "1.39", features = ["fs", "time", "sync"] }
futures = "0.3"
wikidata = "1.1"
Expand All @@ -19,7 +19,7 @@ backon = { version = "1.2", features = ["tokio-sleep"] }

[dev-dependencies]
rstest = "0.22"
surrealdb = { version = "2.0.1", features = ["kv-mem"] }
surrealdb = { version = "2.0.2", features = ["kv-mem"] }
criterion = { version = "0.5", features = ["async_tokio"] }
pprof = { version = "0.13", features = ["criterion", "protobuf-codec"] }

Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ COMPOSE_FILES := surrealdb surrealdb.dev

.PHONY: $(addprefix up-,$(COMPOSE_FILES)) $(addprefix down-,$(COMPOSE_FILES))

up: up-surrealdb
$(addprefix up-,$(COMPOSE_FILES)):
make down-$(subst up-,,$@)
docker compose -f docker-compose-$(subst up-,,$@).yml up --build --pull always -d

down: down-surrealdb
$(addprefix down-,$(COMPOSE_FILES)):
docker compose -f docker-compose-$(subst down-,,$@).yml down --volumes --remove-orphans
docker network prune -f
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-surrealdb.dev.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
surrealdb:
container_name: surrealdb
image: surrealdb/surrealdb:v2.0.1
image: surrealdb/surrealdb:v2.0.2
env_file:
- .env
entrypoint:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-surrealdb.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
surrealdb:
container_name: surrealdb
image: surrealdb/surrealdb:v2.0.1
image: surrealdb/surrealdb:v2.0.2
env_file:
- .env
entrypoint:
Expand Down
24 changes: 12 additions & 12 deletions flake.lock

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

3 changes: 2 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@

packages = {
default = my-crate;
inherit my-crate dockerImage;
inherit my-crate
dockerImage;
};

apps.default = flake-utils.lib.mkApp {
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ async fn main() -> Result<(), Error> {
reader,
Some(pb.clone()),
100,
1_000,
10_000,
)
.await?;

Expand Down

0 comments on commit 57534b8

Please sign in to comment.