-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
One frequent reason that `libribasim` and `ribasim_cli` builds break is because we add a dependency to the core, and we forget to resolve the Manifests of `libribasim` and `ribasim_cli`. (e.g. #484). This adds an entry like `manifest = "../Manifest.toml"` to the `core`, `libribasim` and `ribasim_cli` Project.toml, which all point to the new `root` Manifest. With this they still have their own Project, but a shared Manifest. This option exists to make it easier to work with multiple related projects in one monorepo. ~~As a follow-up we could consider also doing~~ We also do this for the remaining two projects, `docs` and `create_binaries`. `create_binaries` doesn't depend on Ribasim, so there is not as much benefit. `docs` does, currently not via Project.toml, but via adding it to the LOAD_PATH. It would be cleaner to also use a shared Manifest there. One thing to check if the unmaintained docs dependencies don't hold back Ribasim dependencies, see #621 (EDIT: they don't). ~~This is on top of #738, but could be separated out if needed.~~ Also simplifies the docs, and has a not-directly-related commit 8403bef that runs CompatHelper for all projects, not just core. For reference, the root project is populated like this: `dev ./core ./docs build/create_binaries build/libribasim build/ribasim_cli`.
- Loading branch information
Showing
20 changed files
with
231 additions
and
3,179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
name = "root" | ||
authors = ["Deltares and contributors <[email protected]>"] | ||
description = "Meta-project used to share the Manifest of Ribasim and its dependents" | ||
|
||
[deps] | ||
Ribasim = "aac5e3d9-0b8f-4d4f-8241-b1a7a9632635" | ||
create_binaries = "3cfb6a46-05f0-43df-bb16-bf763deb14b4" | ||
docs = "8daea9ca-fc6c-4731-aa85-717fa0b706bc" | ||
libribasim = "f319f290-633d-4573-adfe-d6d5548b6388" | ||
ribasim_cli = "e45c999e-e944-4589-a8e6-7d0b7a60140a" |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,10 @@ | ||
name = "create_binaries" | ||
uuid = "3cfb6a46-05f0-43df-bb16-bf763deb14b4" | ||
authors = ["Deltares and contributors <[email protected]>"] | ||
description = "Build Ribasim binaries with PackageCompiler" | ||
manifest = "../../Manifest.toml" | ||
version = "0.1.0" | ||
|
||
[deps] | ||
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" | ||
LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
__precompile__(false) | ||
|
||
# This is not really a package, but needs to be set up like one so we can run | ||
# `dev build/create_binaries` from the root project. |
Oops, something went wrong.