Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manual patch release #1047

Closed
wants to merge 2 commits into from
Closed

manual patch release #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb06ede
chore: explicitly list lockstep-versioned packages in `release.yml` w…
MingweiSamuel Jan 26, 2024
f96ad8b
chore: manually set lockstep-versioned crates (and `lattices`) to ver…
MingweiSamuel Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
20 changes: 10 additions & 10 deletions Cargo.lock
View file
Open in desktop

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

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions RELEASING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hydro_deploy/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/"
Expand Down
4 changes: 2 additions & 2 deletions hydro_deploy/hydro_cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/"
Expand All @@ -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" ] }
Expand Down
6 changes: 3 additions & 3 deletions hydro_deploy/hydroflow_plus_cli_integration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "hydroflow_plus_cli_integration"
publish = false
version = "0.5.0"
version = "0.5.1"
edition = "2021"

[features]
Expand All @@ -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]
Expand Down
10 changes: 5 additions & 5 deletions hydroflow/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions hydroflow_datalog/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/"
Expand All @@ -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" }
4 changes: 2 additions & 2 deletions hydroflow_datalog_core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion hydroflow_lang/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/"
Expand Down
6 changes: 3 additions & 3 deletions hydroflow_macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/"
Expand All @@ -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"
6 changes: 3 additions & 3 deletions hydroflow_plus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/"
Expand All @@ -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" }
Expand Down
8 changes: 4 additions & 4 deletions hydroflow_plus_test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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"
4 changes: 2 additions & 2 deletions hydroflow_plus_test_macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion lattices/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/"
Expand Down
Loading