From d2b1f1ec59a0758968e2f00c47a9946da4c5a20f Mon Sep 17 00:00:00 2001 From: Martijn Visser Date: Tue, 16 Jan 2024 11:52:42 +0100 Subject: [PATCH 1/2] Add pixi task to update registry --- pixi.toml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pixi.toml b/pixi.toml index f3cea5339..7b695107f 100644 --- a/pixi.toml +++ b/pixi.toml @@ -21,16 +21,22 @@ install-ribasim-testmodels = "pip install --no-deps --editable python/ribasim_te install-pre-commit = "pre-commit install" install-without-pre-commit = { depends_on = [ "install-julia", + "update-registry-julia", "install-ribasim-python", "install-ribasim-api", "install-ribasim-testmodels", ] } install = { depends_on = ["install-without-pre-commit", "install-pre-commit"] } # Instantiate +update-registry-julia = "julia --project --eval='using Pkg; Registry.update()'" instantiate-julia = "julia --project --eval='using Pkg; Pkg.instantiate()'" +initialize-julia = { depends_on = [ + "update-registry-julia", + "instantiate-julia", +] } # Docs build-julia-docs = { cmd = "julia --project=docs docs/make.jl", depends_on = [ - "instantiate-julia", + "initialize-julia", ] } quartodoc-build = { cmd = "quartodoc build && rm objects.json", cwd = "docs" } quarto-preview = { cmd = "quarto preview docs", depends_on = [ @@ -56,15 +62,15 @@ lint = { depends_on = [ # Build build-ribasim-cli = { cmd = "julia --project build.jl --app", cwd = "build/create_binaries", depends_on = [ "generate-testmodels", - "instantiate-julia", + "initialize-julia", ] } build-libribasim = { cmd = "julia --project build.jl --lib", cwd = "build/create_binaries", depends_on = [ "generate-testmodels", - "instantiate-julia", + "initialize-julia", ] } build = { "cmd" = "julia --project build.jl --app --lib", cwd = "build/create_binaries", depends_on = [ "generate-testmodels", - "instantiate-julia", + "initialize-julia", ] } remove-artifacts = "julia --eval 'rm(joinpath(Base.DEPOT_PATH[1], \"artifacts\"), force=true, recursive=true)'" From 8a34fcbc44f400a22367532a830c4792b7512e8c Mon Sep 17 00:00:00 2001 From: Martijn Visser Date: Tue, 16 Jan 2024 14:58:51 +0100 Subject: [PATCH 2/2] review --- pixi.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixi.toml b/pixi.toml index 7b695107f..c042758da 100644 --- a/pixi.toml +++ b/pixi.toml @@ -28,7 +28,7 @@ install-without-pre-commit = { depends_on = [ ] } install = { depends_on = ["install-without-pre-commit", "install-pre-commit"] } # Instantiate -update-registry-julia = "julia --project --eval='using Pkg; Registry.update()'" +update-registry-julia = "julia --eval='using Pkg; Registry.update()'" instantiate-julia = "julia --project --eval='using Pkg; Pkg.instantiate()'" initialize-julia = { depends_on = [ "update-registry-julia",