From 93c9ae8d60d1a017aeb5d606582bec9baf61a0c4 Mon Sep 17 00:00:00 2001 From: Moritz Hoffmann Date: Tue, 29 Oct 2024 17:09:02 +0100 Subject: [PATCH] Add support for release-plz (#531) * Add support for release-plz Signed-off-by: Moritz Hoffmann * Only publish differential-dataflow and differential-dogs3 Signed-off-by: Moritz Hoffmann * Separate changelogs Signed-off-by: Moritz Hoffmann * Fix tests Signed-off-by: Moritz Hoffmann --------- Signed-off-by: Moritz Hoffmann --- .github/dependabot.yml | 8 +++++++ .github/workflows/release-plz.yml | 27 +++++++++++++++++++++++ Cargo.toml | 3 +-- advent_of_code_2017/Cargo.toml | 3 ++- dogsdogsdogs/Cargo.toml | 5 ++--- dogsdogsdogs/examples/delta_query.rs | 8 +++---- dogsdogsdogs/examples/delta_query2.rs | 2 +- dogsdogsdogs/examples/delta_query_wcoj.rs | 6 ++--- dogsdogsdogs/examples/dogsdogsdogs.rs | 4 ++-- dogsdogsdogs/src/altneu.rs | 2 +- doop/Cargo.toml | 3 ++- experiments/Cargo.toml | 3 ++- interactive/Cargo.toml | 3 ++- release-plz.toml | 19 ++++++++++++++++ server/Cargo.toml | 1 + server/dataflows/degr_dist/Cargo.toml | 3 ++- server/dataflows/neighborhood/Cargo.toml | 3 ++- server/dataflows/random_graph/Cargo.toml | 3 ++- server/dataflows/reachability/Cargo.toml | 3 ++- 19 files changed, 85 insertions(+), 24 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/release-plz.yml create mode 100644 release-plz.toml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..77723d7504 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,8 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + # Check for updates every Monday + schedule: + interval: "weekly" + diff --git a/.github/workflows/release-plz.yml b/.github/workflows/release-plz.yml new file mode 100644 index 0000000000..ce82bed942 --- /dev/null +++ b/.github/workflows/release-plz.yml @@ -0,0 +1,27 @@ +name: Release-plz + +permissions: + pull-requests: write + contents: write + +on: + push: + branches: + - master + +jobs: + release-plz: + name: Release-plz + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Install Rust toolchain + uses: actions-rust-lang/setup-rust-toolchain@v1 + - name: Run release-plz + uses: MarcoIeni/release-plz-action@v0.5 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CARGO_REGISTRY_TOKEN: ${{ secrets.DIFFERENTIAL_RELEASE_PLZ }} diff --git a/Cargo.toml b/Cargo.toml index 07c912199c..16c7cfbbd3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,8 +46,7 @@ fnv="1.0.2" timely = {workspace = true} [workspace.dependencies] -#timely = { version = "0.12", default-features = false } -timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false } +timely = { version = "0.13", default-features = false } #timely = { path = "../timely-dataflow/timely/", default-features = false } [features] diff --git a/advent_of_code_2017/Cargo.toml b/advent_of_code_2017/Cargo.toml index 8a19c6d87e..a1b3dce179 100644 --- a/advent_of_code_2017/Cargo.toml +++ b/advent_of_code_2017/Cargo.toml @@ -2,7 +2,8 @@ name = "advent_of_code_2017" version = "0.1.0" authors = ["Frank McSherry "] +publish = false [dependencies] differential-dataflow = { path = "../" } -timely = { git = "https://github.com/frankmcsherry/timely-dataflow" } \ No newline at end of file +timely = { git = "https://github.com/frankmcsherry/timely-dataflow" } diff --git a/dogsdogsdogs/Cargo.toml b/dogsdogsdogs/Cargo.toml index 1d21ea7a92..fb0b6e8746 100644 --- a/dogsdogsdogs/Cargo.toml +++ b/dogsdogsdogs/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "dogsdogsdogs" +name = "differential-dogs3" version = "0.1.0" authors = ["Frank McSherry "] license = "MIT" @@ -8,8 +8,7 @@ edition = "2021" [dependencies] timely = { workspace = true } differential-dataflow = { path = "../", default-features = false } -serde = "1" -serde_derive = "1" +serde = { version = "1.0", features = ["derive"]} [dev-dependencies] graph_map = "0.1" diff --git a/dogsdogsdogs/examples/delta_query.rs b/dogsdogsdogs/examples/delta_query.rs index 2f2a9ba108..59df54f239 100644 --- a/dogsdogsdogs/examples/delta_query.rs +++ b/dogsdogsdogs/examples/delta_query.rs @@ -4,8 +4,8 @@ use differential_dataflow::input::Input; use differential_dataflow::operators::JoinCore; use graph_map::GraphMMap; -use dogsdogsdogs::altneu::AltNeu; -use dogsdogsdogs::calculus::{Differentiate, Integrate}; +use differential_dogs3::altneu::AltNeu; +use differential_dogs3::calculus::{Differentiate, Integrate}; fn main() { @@ -74,8 +74,8 @@ fn main() { let key1 = |x: &(u32, u32)| x.0; let key2 = |x: &(u32, u32)| x.1; - use dogsdogsdogs::operators::propose; - use dogsdogsdogs::operators::validate; + use differential_dogs3::operators::propose; + use differential_dogs3::operators::validate; // Prior technology // dQ/dE1 := dE1(a,b), E2(b,c), E3(a,c) diff --git a/dogsdogsdogs/examples/delta_query2.rs b/dogsdogsdogs/examples/delta_query2.rs index b1d8611772..f6a2259686 100644 --- a/dogsdogsdogs/examples/delta_query2.rs +++ b/dogsdogsdogs/examples/delta_query2.rs @@ -33,7 +33,7 @@ fn main() { let changes1 = edges1.inner.map(|((k,v),t,r)| ((k,v,t.clone()),t,r)).as_collection(); let changes2 = edges2.inner.map(|((k,v),t,r)| ((k,v,t.clone()),t,r)).as_collection(); - use dogsdogsdogs::operators::half_join; + use differential_dogs3::operators::half_join; // pick a frontier that will not mislead TOTAL ORDER comparisons. let closure = |time: &Product, antichain: &mut timely::progress::Antichain>| { diff --git a/dogsdogsdogs/examples/delta_query_wcoj.rs b/dogsdogsdogs/examples/delta_query_wcoj.rs index 3555264f93..260c7159f3 100644 --- a/dogsdogsdogs/examples/delta_query_wcoj.rs +++ b/dogsdogsdogs/examples/delta_query_wcoj.rs @@ -3,8 +3,8 @@ use timely::dataflow::operators::probe::Handle; use differential_dataflow::input::Input; use graph_map::GraphMMap; -use dogsdogsdogs::{CollectionIndex, altneu::AltNeu}; -use dogsdogsdogs::{ProposeExtensionMethod}; +use differential_dogs3::{CollectionIndex, altneu::AltNeu}; +use differential_dogs3::{ProposeExtensionMethod}; fn main() { @@ -107,4 +107,4 @@ fn main() { } }).unwrap(); -} \ No newline at end of file +} diff --git a/dogsdogsdogs/examples/dogsdogsdogs.rs b/dogsdogsdogs/examples/dogsdogsdogs.rs index defeafd861..6f906df35b 100644 --- a/dogsdogsdogs/examples/dogsdogsdogs.rs +++ b/dogsdogsdogs/examples/dogsdogsdogs.rs @@ -4,7 +4,7 @@ use differential_dataflow::{Collection, AsCollection}; use differential_dataflow::input::Input; use graph_map::GraphMMap; -use dogsdogsdogs::{CollectionIndex, PrefixExtender}; +use differential_dogs3::{CollectionIndex, PrefixExtender}; fn main() { @@ -86,4 +86,4 @@ fn main() { } }).unwrap(); -} \ No newline at end of file +} diff --git a/dogsdogsdogs/src/altneu.rs b/dogsdogsdogs/src/altneu.rs index c025f9f838..95d69cbc07 100644 --- a/dogsdogsdogs/src/altneu.rs +++ b/dogsdogsdogs/src/altneu.rs @@ -11,7 +11,7 @@ //! element of the second lattice, if neither first element equals //! the join. -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; /// A pair of timestamps, partially ordered by the product order. #[derive(Debug, Hash, Default, Clone, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize)] diff --git a/doop/Cargo.toml b/doop/Cargo.toml index cd1a88be84..d525c5d9ab 100644 --- a/doop/Cargo.toml +++ b/doop/Cargo.toml @@ -3,8 +3,9 @@ name = "doop" version = "0.1.0" authors = ["Frank McSherry "] edition = "2021" +publish = false [dependencies] indexmap = "2.1" timely = {workspace = true} -differential-dataflow = { path = "../" } \ No newline at end of file +differential-dataflow = { path = "../" } diff --git a/experiments/Cargo.toml b/experiments/Cargo.toml index 1f9db3b9ac..e7ae2e829c 100644 --- a/experiments/Cargo.toml +++ b/experiments/Cargo.toml @@ -3,6 +3,7 @@ name = "experiments" version = "0.1.0" authors = ["Frank McSherry "] edition = "2021" +publish = false [dependencies] core_affinity = "0.5.9" @@ -11,4 +12,4 @@ rand="0.3.13" timely = { workspace = true } differential-dataflow = { path = "../" } graph_map = { git = "https://github.com/frankmcsherry/graph-map" } -serde = { version = "1.0.190", features = ["derive"] } +serde = { version = "1.0", features = ["derive"] } diff --git a/interactive/Cargo.toml b/interactive/Cargo.toml index a7967c4433..73b578a9c1 100644 --- a/interactive/Cargo.toml +++ b/interactive/Cargo.toml @@ -3,6 +3,7 @@ name = "interactive" version = "0.1.0" authors = ["Frank McSherry "] edition = "2021" +publish = false [dependencies] bincode = "1" @@ -10,4 +11,4 @@ serde = { version = "1", features = ["derive"]} differential-dataflow = { path = "../" } dogsdogsdogs = { path = "../dogsdogsdogs" } timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", features = ["bincode"] } -#timely = { path = "../../timely-dataflow/timely", features = ["bincode"] } \ No newline at end of file +#timely = { path = "../../timely-dataflow/timely", features = ["bincode"] } diff --git a/release-plz.toml b/release-plz.toml new file mode 100644 index 0000000000..163a74d5a1 --- /dev/null +++ b/release-plz.toml @@ -0,0 +1,19 @@ +[workspace] +# disable the changelog for all packages +changelog_update = false +# disable releasing all packages +release = false + +[[package]] +name = "differential-dataflow" +# enable releasing package +release = true +# enable the changelog for this package +changelog_update = true + +[[package]] +name = "differential-dogs3" +# enable releasing package +release = true +# enable the changelog for this package +changelog_update = true diff --git a/server/Cargo.toml b/server/Cargo.toml index ed79bb187a..5f7c152042 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -3,6 +3,7 @@ name = "dd_server" version = "0.1.0" authors = ["Frank McSherry "] edition = "2021" +publish = false [dependencies.differential-dataflow] path="../" diff --git a/server/dataflows/degr_dist/Cargo.toml b/server/dataflows/degr_dist/Cargo.toml index 417c2d55cd..40f29e1889 100644 --- a/server/dataflows/degr_dist/Cargo.toml +++ b/server/dataflows/degr_dist/Cargo.toml @@ -3,6 +3,7 @@ name = "degr_dist" version = "0.1.0" authors = ["Frank McSherry "] edition = "2021" +publish = false [dependencies] timely = { workspace = true } @@ -10,4 +11,4 @@ differential-dataflow = { path = "../../../" } dd_server = { path = "../../" } [lib] -crate-type = ["dylib"] \ No newline at end of file +crate-type = ["dylib"] diff --git a/server/dataflows/neighborhood/Cargo.toml b/server/dataflows/neighborhood/Cargo.toml index eabe1d2bff..b73d7f19ec 100644 --- a/server/dataflows/neighborhood/Cargo.toml +++ b/server/dataflows/neighborhood/Cargo.toml @@ -3,10 +3,11 @@ name = "neighborhood" version = "0.1.0" authors = ["Frank McSherry "] edition = "2021" +publish = false [dependencies] differential-dataflow = { path = "../../../" } dd_server = { path = "../../" } [lib] -crate-type = ["dylib"] \ No newline at end of file +crate-type = ["dylib"] diff --git a/server/dataflows/random_graph/Cargo.toml b/server/dataflows/random_graph/Cargo.toml index 2b7bb9f4bb..d09c16a0da 100644 --- a/server/dataflows/random_graph/Cargo.toml +++ b/server/dataflows/random_graph/Cargo.toml @@ -3,6 +3,7 @@ name = "random_graph" version = "0.1.0" authors = ["Frank McSherry "] edition = "2021" +publish = false [dependencies] timely = {workspace = true} @@ -13,4 +14,4 @@ rand="0.3.13" hdrhist = { git = "https://github.com/utaal/hdrhist" } [lib] -crate-type = ["dylib"] \ No newline at end of file +crate-type = ["dylib"] diff --git a/server/dataflows/reachability/Cargo.toml b/server/dataflows/reachability/Cargo.toml index 29ca8d2540..82899e84f4 100644 --- a/server/dataflows/reachability/Cargo.toml +++ b/server/dataflows/reachability/Cargo.toml @@ -3,10 +3,11 @@ name = "reachability" version = "0.1.0" authors = ["Frank McSherry "] edition = "2021" +publish = false [dependencies] differential-dataflow = { path = "../../../" } dd_server = { path = "../../" } [lib] -crate-type = ["dylib"] \ No newline at end of file +crate-type = ["dylib"]