From 4b0aabe9f6b4a7ddd9fccc9d3eabb5b1829bea41 Mon Sep 17 00:00:00 2001 From: Christian Legnitto Date: Wed, 26 Jan 2022 23:11:17 -0800 Subject: [PATCH] More breaking changes with cargo-release 0.19.0 --- Makefile.toml | 6 +++--- _build/release.toml | 1 - juniper/Makefile.toml | 6 +++--- juniper/release.toml | 1 - juniper_codegen/Makefile.toml | 6 +++--- juniper_codegen/release.toml | 1 - juniper_graphql_ws/Makefile.toml | 7 ++++--- juniper_graphql_ws/release.toml | 1 - juniper_subscriptions/Makefile.toml | 6 +++--- juniper_subscriptions/release.toml | 1 - 10 files changed, 16 insertions(+), 20 deletions(-) diff --git a/Makefile.toml b/Makefile.toml index 812ce9a6..a23a63ba 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -12,7 +12,7 @@ CARGO_MAKE_WORKSPACE_SKIP_MEMBERS = "integration_tests/*;examples/*;juniper_benc [tasks.release] condition = { env_set = [ "RELEASE_LEVEL" ] } command = "cargo-release" -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/release.toml", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/release.toml", "--execute", "${RELEASE_LEVEL}"] # Run `RELEASE_LEVEL=(patch|major|minor) cargo make release-dry-run` to do a dry run. @@ -23,7 +23,7 @@ args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/releas condition = { env_set = [ "RELEASE_LEVEL" ] } description = "Run `cargo-release --dry-run` for every crate" command = "cargo-release" -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/release.toml", "--dry-run", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/release.toml", "--no-confirm", "--no-publish", "--no-push", "--no-tag", "${RELEASE_LEVEL}"] # Run `RELEASE_LEVEL=(patch|major|minor) cargo make release-local-test` to actually make changes locally but @@ -35,4 +35,4 @@ args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/releas condition = { env_set = [ "RELEASE_LEVEL" ] } description = "Run `cargo-release` for every crate, but only make changes locally" command = "cargo-release" -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/release.toml", "--no-confirm", "--skip-publish", "--skip-push", "--skip-tag", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/release.toml", "--no-confirm", "${RELEASE_LEVEL}"] diff --git a/_build/release.toml b/_build/release.toml index 72d403b5..b0acba60 100644 --- a/_build/release.toml +++ b/_build/release.toml @@ -1,4 +1,3 @@ -no-dev-version = true pre-release-commit-message = "Release {{crate_name}} {{version}}" post-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" tag-message = "Release {{crate_name}} {{version}}" diff --git a/juniper/Makefile.toml b/juniper/Makefile.toml index 6f6e065e..6736f477 100644 --- a/juniper/Makefile.toml +++ b/juniper/Makefile.toml @@ -4,13 +4,13 @@ CARGO_MAKE_CARGO_ALL_FEATURES = "" [tasks.release] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--execute", "${RELEASE_LEVEL}"] [tasks.release-dry-run] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--dry-run", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--no-publish", "--no-push", "--no-tag", "${RELEASE_LEVEL}"] [tasks.release-local-test] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--skip-publish", "--skip-push", "--skip-tag", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "${RELEASE_LEVEL}"] [tasks.test] args = ["test", "--all-features"] diff --git a/juniper/release.toml b/juniper/release.toml index 54388c07..d3dea325 100644 --- a/juniper/release.toml +++ b/juniper/release.toml @@ -1,4 +1,3 @@ -no-dev-version = true pre-release-commit-message = "Release {{crate_name}} {{version}}" post-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" tag-message = "Release {{crate_name}} {{version}}" diff --git a/juniper_codegen/Makefile.toml b/juniper_codegen/Makefile.toml index 6eca6486..58aa74fb 100644 --- a/juniper_codegen/Makefile.toml +++ b/juniper_codegen/Makefile.toml @@ -2,10 +2,10 @@ # release config. [tasks.release] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--execute", "${RELEASE_LEVEL}"] [tasks.release-dry-run] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--dry-run", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--no-publish", "--no-push", "--no-tag", "${RELEASE_LEVEL}"] [tasks.release-local-test] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--skip-publish", "--skip-push", "--skip-tag", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "${RELEASE_LEVEL}"] diff --git a/juniper_codegen/release.toml b/juniper_codegen/release.toml index ec5368a9..33a9caec 100644 --- a/juniper_codegen/release.toml +++ b/juniper_codegen/release.toml @@ -1,4 +1,3 @@ -no-dev-version = true pre-release-commit-message = "Release {{crate_name}} {{version}}" post-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" tag-message = "Release {{crate_name}} {{version}}" diff --git a/juniper_graphql_ws/Makefile.toml b/juniper_graphql_ws/Makefile.toml index f6bd8ee1..8a804aba 100644 --- a/juniper_graphql_ws/Makefile.toml +++ b/juniper_graphql_ws/Makefile.toml @@ -2,13 +2,14 @@ # release config. [tasks.release] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--execute", "${RELEASE_LEVEL}"] [tasks.release-dry-run] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--dry-run", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--no-publish", "--no-push", "--no-tag", "${RELEASE_LEVEL}"] [tasks.release-local-test] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--skip-publish", "--skip-push", "--skip-tag", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "${RELEASE_LEVEL}"] + [env] CARGO_MAKE_CARGO_ALL_FEATURES = "" diff --git a/juniper_graphql_ws/release.toml b/juniper_graphql_ws/release.toml index 90382749..a7356262 100644 --- a/juniper_graphql_ws/release.toml +++ b/juniper_graphql_ws/release.toml @@ -1,4 +1,3 @@ -no-dev-version = true pre-release-commit-message = "Release {{crate_name}} {{version}}" post-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" tag-message = "Release {{crate_name}} {{version}}" diff --git a/juniper_subscriptions/Makefile.toml b/juniper_subscriptions/Makefile.toml index f0c7fd40..afbd4f96 100644 --- a/juniper_subscriptions/Makefile.toml +++ b/juniper_subscriptions/Makefile.toml @@ -3,13 +3,13 @@ # release config. [tasks.release] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--execute", "${RELEASE_LEVEL}"] [tasks.release-dry-run] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--dry-run", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--no-publish", "--no-push", "--no-tag", "${RELEASE_LEVEL}"] [tasks.release-local-test] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--skip-publish", "--skip-push", "--skip-tag", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "${RELEASE_LEVEL}"] [env] CARGO_MAKE_CARGO_ALL_FEATURES = "" diff --git a/juniper_subscriptions/release.toml b/juniper_subscriptions/release.toml index f84ce2b0..4108f647 100644 --- a/juniper_subscriptions/release.toml +++ b/juniper_subscriptions/release.toml @@ -1,4 +1,3 @@ -no-dev-version = true pre-release-commit-message = "Release {{crate_name}} {{version}}" post-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" tag-message = "Release {{crate_name}} {{version}}"