diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4261bd3a00ca..fab213ab7a2f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,12 +79,15 @@ jobs: args: cargo-smart-release - name: Run cargo smart-release + # list lockstep-versioned packages at the end of this command run: >- cargo smart-release --update-crates-index --no-changelog-preview --allow-fully-generated-changelogs --bump ${{ inputs.bump }} --bump-dependencies auto ${{ inputs.execute && '--execute' || '--no-publish' }} - hydroflow hydro_cli hydroflow_* + hydroflow hydroflow_lang hydroflow_macro hydroflow_plus + hydroflow_datalog hydroflow_datalog_core + hydro_deploy hydro_cli hydroflow_cli_integration hydroflow_plus_cli_integration env: # Make sure to set this so the `gh` CLI works using our token. GH_TOKEN: ${{ steps.generate_token.outputs.token }} diff --git a/Cargo.lock b/Cargo.lock index e8fe6a0fc3c9..60cadf083153 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1365,7 +1365,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hydro_cli" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "async-channel 1.9.0", @@ -1400,7 +1400,7 @@ dependencies = [ [[package]] name = "hydro_deploy" -version = "0.5.0" +version = "0.5.1" dependencies = [ "anyhow", "async-channel 1.9.0", @@ -1430,7 +1430,7 @@ dependencies = [ [[package]] name = "hydroflow" -version = "0.5.0" +version = "0.5.1" dependencies = [ "bincode", "byteorder", @@ -1496,7 +1496,7 @@ dependencies = [ [[package]] name = "hydroflow_datalog" -version = "0.5.0" +version = "0.5.1" dependencies = [ "hydroflow_datalog_core", "proc-macro-crate", @@ -1507,7 +1507,7 @@ dependencies = [ [[package]] name = "hydroflow_datalog_core" -version = "0.5.0" +version = "0.5.1" dependencies = [ "hydroflow_lang", "insta", @@ -1524,7 +1524,7 @@ dependencies = [ [[package]] name = "hydroflow_lang" -version = "0.5.0" +version = "0.5.1" dependencies = [ "auto_impl", "clap 4.4.11", @@ -1543,7 +1543,7 @@ dependencies = [ [[package]] name = "hydroflow_macro" -version = "0.5.0" +version = "0.5.1" dependencies = [ "hydroflow_lang", "itertools", @@ -1555,7 +1555,7 @@ dependencies = [ [[package]] name = "hydroflow_plus" -version = "0.5.0" +version = "0.5.1" dependencies = [ "bincode", "hydroflow", @@ -1571,7 +1571,7 @@ dependencies = [ [[package]] name = "hydroflow_plus_cli_integration" -version = "0.5.0" +version = "0.5.1" dependencies = [ "async-channel 1.9.0", "hydro_deploy", @@ -1788,7 +1788,7 @@ dependencies = [ [[package]] name = "lattices" -version = "0.5.0" +version = "0.5.1" dependencies = [ "cc-traits", "sealed", diff --git a/Cargo.toml b/Cargo.toml index f91780c08a74..537c3f936409 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ # See "Adding new crates" and "Moving crates" addendum sections in `RELEASING.md` members = [ "benches", + "hydro_deploy/core", "hydro_deploy/hydro_cli", "hydro_deploy/hydro_cli_examples", "hydro_deploy/hydroflow_cli_integration", diff --git a/RELEASING.md b/RELEASING.md index c00adb5413ee..4ef7801e3e48 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -98,6 +98,9 @@ When adding a new crate which is published, you need to: https://doc.rust-lang.org/cargo/reference/publishing.html#before-publishing-a-new-crate 2. Ensure any `path` dependencies to/from `my_crate` also include `version = "^0.1.0"` (substitute correct version). +3. If you want your package to be lockstep-versioned alongside hydroflow then make sure to add it + to the [command in the `release.yml` workflow](https://github.com/hydro-project/hydroflow/blob/main/.github/workflows/release.yml#L82). + Then just run the release workflow as normal. Previously this section also required creating an empty changelog file: "Commit an (empty) file diff --git a/hydro_deploy/core/Cargo.toml b/hydro_deploy/core/Cargo.toml index 47114e0eb104..9c11a37bdc8a 100644 --- a/hydro_deploy/core/Cargo.toml +++ b/hydro_deploy/core/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "hydro_deploy" publish = true -version = "0.5.0" +version = "0.5.1" edition = "2021" license = "Apache-2.0" documentation = "https://docs.rs/hydro_deploy/" diff --git a/hydro_deploy/hydro_cli/Cargo.toml b/hydro_deploy/hydro_cli/Cargo.toml index 3cd026e8017d..40a7f757925a 100644 --- a/hydro_deploy/hydro_cli/Cargo.toml +++ b/hydro_deploy/hydro_cli/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "hydro_cli" publish = true -version = "0.5.0" +version = "0.5.1" edition = "2021" license = "Apache-2.0" documentation = "https://docs.rs/hydro_cli/" @@ -13,7 +13,7 @@ name = "hydro_cli" crate-type = ["cdylib"] [dependencies] -hydro_deploy = { path = "../core", version = "^0.5.0" } +hydro_deploy = { path = "../core", version = "^0.5.1" } tokio = { version = "1.16", features = [ "full" ] } once_cell = "1.17" anyhow = { version = "1.0.69", features = [ "backtrace" ] } diff --git a/hydro_deploy/hydroflow_plus_cli_integration/Cargo.toml b/hydro_deploy/hydroflow_plus_cli_integration/Cargo.toml index 567eb3e2ba41..702858b2caca 100644 --- a/hydro_deploy/hydroflow_plus_cli_integration/Cargo.toml +++ b/hydro_deploy/hydroflow_plus_cli_integration/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "hydroflow_plus_cli_integration" publish = false -version = "0.5.0" +version = "0.5.1" edition = "2021" [features] @@ -10,12 +10,12 @@ deploy = [ "hydro_deploy", "async-channel" ] [dependencies] stageleft = { path = "../../stageleft", version = "^0.1.0" } -hydroflow_plus = { path = "../../hydroflow_plus", version = "^0.5.0", features = [ "cli_integration" ] } +hydroflow_plus = { path = "../../hydroflow_plus", version = "^0.5.1", features = [ "cli_integration" ] } syn = { version = "2.0.0", features = [ "parsing", "extra-traits" ] } tokio = { version = "1.16", features = [ "full" ] } serde = { version = "1", features = [ "derive" ] } -hydro_deploy = { path = "../core", version = "^0.5.0", optional = true } +hydro_deploy = { path = "../core", version = "^0.5.1", optional = true } async-channel = { version = "1.8.0", optional = true } [build-dependencies] diff --git a/hydroflow/Cargo.toml b/hydroflow/Cargo.toml index 811dfbeb15fd..e10c71c5d8b1 100644 --- a/hydroflow/Cargo.toml +++ b/hydroflow/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "hydroflow" publish = true -version = "0.5.0" +version = "0.5.1" edition = "2021" license = "Apache-2.0" documentation = "https://docs.rs/hydroflow/" @@ -32,11 +32,11 @@ byteorder = "1.4.3" bytes = "1.1.0" futures = "0.3" hydroflow_cli_integration = { optional = true, path = "../hydro_deploy/hydroflow_cli_integration", version = "^0.3.0" } -hydroflow_datalog = { optional = true, path = "../hydroflow_datalog", version = "^0.5.0" } -hydroflow_lang = { path = "../hydroflow_lang", version = "^0.5.0" } -hydroflow_macro = { optional = true, path = "../hydroflow_macro", version = "^0.5.0" } +hydroflow_datalog = { optional = true, path = "../hydroflow_datalog", version = "^0.5.1" } +hydroflow_lang = { path = "../hydroflow_lang", version = "^0.5.1" } +hydroflow_macro = { optional = true, path = "../hydroflow_macro", version = "^0.5.1" } itertools = "0.10" -lattices = { path = "../lattices", version = "^0.5.0", features = [ "serde" ] } +lattices = { path = "../lattices", version = "^0.5.1", features = [ "serde" ] } pusherator = { path = "../pusherator", version = "^0.0.3" } pyo3 = { optional = true, version = "0.18" } ref-cast = "1.0" diff --git a/hydroflow_datalog/Cargo.toml b/hydroflow_datalog/Cargo.toml index 80e59b7115c2..029fcf5fb171 100644 --- a/hydroflow_datalog/Cargo.toml +++ b/hydroflow_datalog/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "hydroflow_datalog" publish = true -version = "0.5.0" +version = "0.5.1" edition = "2021" license = "Apache-2.0" documentation = "https://docs.rs/hydroflow_datalog/" @@ -22,4 +22,4 @@ proc-macro-crate = "1.1.0" # Note: If we ever compile this proc macro crate to WASM (e.g., if we are # building on a WASM host), we may need to turn diagnostics off for WASM if # proc_macro2 does not support WASM at that time. -hydroflow_datalog_core = { path = "../hydroflow_datalog_core", version = "^0.5.0" } +hydroflow_datalog_core = { path = "../hydroflow_datalog_core", version = "^0.5.1" } diff --git a/hydroflow_datalog_core/Cargo.toml b/hydroflow_datalog_core/Cargo.toml index f1d374b03d3a..c94bb049e603 100644 --- a/hydroflow_datalog_core/Cargo.toml +++ b/hydroflow_datalog_core/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "hydroflow_datalog_core" publish = true -version = "0.5.0" +version = "0.5.1" edition = "2021" license = "Apache-2.0" documentation = "https://docs.rs/hydroflow_datalog_core/" @@ -21,7 +21,7 @@ syn = { version = "2.0.0", features = [ "parsing", "extra-traits" ] } proc-macro2 = "1.0.63" proc-macro-crate = "1.1.0" rust-sitter = "0.3.2" -hydroflow_lang = { path = "../hydroflow_lang", version = "^0.5.0" } +hydroflow_lang = { path = "../hydroflow_lang", version = "^0.5.1" } [build-dependencies] rust-sitter-tool = "0.3.2" diff --git a/hydroflow_lang/Cargo.toml b/hydroflow_lang/Cargo.toml index 298a114ba103..179b5b2304a5 100644 --- a/hydroflow_lang/Cargo.toml +++ b/hydroflow_lang/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "hydroflow_lang" publish = true -version = "0.5.0" +version = "0.5.1" edition = "2021" license = "Apache-2.0" documentation = "https://docs.rs/hydroflow_lang/" diff --git a/hydroflow_macro/Cargo.toml b/hydroflow_macro/Cargo.toml index f3bd93b5c9fc..d42801978a11 100644 --- a/hydroflow_macro/Cargo.toml +++ b/hydroflow_macro/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "hydroflow_macro" publish = true -version = "0.5.0" +version = "0.5.1" edition = "2021" license = "Apache-2.0" documentation = "https://docs.rs/hydroflow_macro/" @@ -17,13 +17,13 @@ diagnostics = [ "hydroflow_lang/diagnostics" ] # Note: If we ever compile this proc macro crate to WASM (e.g., if we are # building on a WASM host), we may need to turn diagnostics off for WASM if # proc_macro2 still does not support WASM. -hydroflow_lang = { path = "../hydroflow_lang", version = "^0.5.0" } +hydroflow_lang = { path = "../hydroflow_lang", version = "^0.5.1" } proc-macro2 = "1.0.63" proc-macro-crate = "1.1.0" quote = "1.0.0" syn = { version = "2.0.0", features = [ "parsing", "extra-traits" ] } [build-dependencies] -hydroflow_lang = { path = "../hydroflow_lang", version = "^0.5.0" } +hydroflow_lang = { path = "../hydroflow_lang", version = "^0.5.1" } itertools = "0.10" quote = "1.0.0" diff --git a/hydroflow_plus/Cargo.toml b/hydroflow_plus/Cargo.toml index 1e1761df125e..cd86fec031a5 100644 --- a/hydroflow_plus/Cargo.toml +++ b/hydroflow_plus/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "hydroflow_plus" publish = true -version = "0.5.0" +version = "0.5.1" edition = "2021" license = "Apache-2.0" documentation = "https://docs.rs/hydroflow_plus/" @@ -20,8 +20,8 @@ quote = "1.0.0" syn = { version = "2.0.0", features = [ "parsing", "extra-traits", "visit-mut" ] } proc-macro2 = "1.0.57" proc-macro-crate = "1.1.0" -hydroflow = { path = "../hydroflow", version = "^0.5.0", default-features = false } -hydroflow_lang = { path = "../hydroflow_lang", version = "^0.5.0" } +hydroflow = { path = "../hydroflow", version = "^0.5.1", default-features = false } +hydroflow_lang = { path = "../hydroflow_lang", version = "^0.5.1" } serde = { version = "1", features = [ "derive" ] } bincode = "1.3" stageleft = { path = "../stageleft", version = "^0.1.0" } diff --git a/hydroflow_plus_test/Cargo.toml b/hydroflow_plus_test/Cargo.toml index 0b3687a3d820..316f33e34f0c 100644 --- a/hydroflow_plus_test/Cargo.toml +++ b/hydroflow_plus_test/Cargo.toml @@ -5,10 +5,10 @@ version = "0.0.0" edition = "2021" [dependencies] -hydroflow_plus = { path = "../hydroflow_plus", version = "^0.5.0" } +hydroflow_plus = { path = "../hydroflow_plus", version = "^0.5.1" } tokio = { version = "1.16", features = [ "full" ] } stageleft = { path = "../stageleft", version = "^0.1.0" } -hydroflow_plus_cli_integration = { path = "../hydro_deploy/hydroflow_plus_cli_integration", version = "^0.5.0" } +hydroflow_plus_cli_integration = { path = "../hydro_deploy/hydroflow_plus_cli_integration", version = "^0.5.1" } rand = "0.8.5" hydroflow_plus_test_macro = { path = "../hydroflow_plus_test_macro" } @@ -18,6 +18,6 @@ stageleft_tool = { path = "../stageleft_tool", version = "^0.1.0" } [dev-dependencies] insta = "1.7.1" -hydro_deploy = { path = "../hydro_deploy/core", version = "^0.5.0" } -hydroflow_plus_cli_integration = { path = "../hydro_deploy/hydroflow_plus_cli_integration", version = "^0.5.0", features = [ "deploy" ] } +hydro_deploy = { path = "../hydro_deploy/core", version = "^0.5.1" } +hydroflow_plus_cli_integration = { path = "../hydro_deploy/hydroflow_plus_cli_integration", version = "^0.5.1", features = [ "deploy" ] } futures = "0.3" diff --git a/hydroflow_plus_test_macro/Cargo.toml b/hydroflow_plus_test_macro/Cargo.toml index 5e62c53e6730..dbc16d15a4f6 100644 --- a/hydroflow_plus_test_macro/Cargo.toml +++ b/hydroflow_plus_test_macro/Cargo.toml @@ -13,10 +13,10 @@ default = ["macro"] macro = [] [dependencies] -hydroflow_plus = { path = "../hydroflow_plus", version = "^0.5.0" } +hydroflow_plus = { path = "../hydroflow_plus", version = "^0.5.1" } tokio = { version = "1.16", features = [ "full" ] } stageleft = { path = "../stageleft", version = "^0.1.0" } -hydroflow_plus_cli_integration = { path = "../hydro_deploy/hydroflow_plus_cli_integration", version = "^0.5.0" } +hydroflow_plus_cli_integration = { path = "../hydro_deploy/hydroflow_plus_cli_integration", version = "^0.5.1" } rand = "0.8.5" [build-dependencies] diff --git a/lattices/Cargo.toml b/lattices/Cargo.toml index 3c0e18068724..fd396fa301f5 100644 --- a/lattices/Cargo.toml +++ b/lattices/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "lattices" publish = true -version = "0.5.0" +version = "0.5.1" edition = "2021" license = "Apache-2.0" documentation = "https://docs.rs/lattices/"