diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ca67c5f..3662d2db 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Added new CARGO_MAKE_RUST_TARGET_TRIPLE environment variables #356 (thanks @daxpedda) * Upgraded duckscript version * Increased minimal rust version to 1.39.0 +* Added condition for build-publish-flow to restrict only to master branch #364 ### v0.25.1 (2020-01-03) diff --git a/src/lib/Makefile.stable.toml b/src/lib/Makefile.stable.toml index e4e73d15..add6edb7 100755 --- a/src/lib/Makefile.stable.toml +++ b/src/lib/Makefile.stable.toml @@ -1185,7 +1185,7 @@ script = [ description = "Runs full sanity, generates github release and publishes the crate." category = "Publish" workspace = false -condition = { env_set = [ "COMMIT_MSG", "GITHUB_API_TOKEN", "GITHUB_REPO_NAME" ] } +condition = { env_set = [ "COMMIT_MSG", "GITHUB_API_TOKEN", "GITHUB_REPO_NAME" ], env = { "CARGO_MAKE_GIT_BRANCH" = "master" } } env = { "CARGO_MAKE_SKIP_PREPUBLISH_CLEAN" = true } run_task = [ { name = "workspace-build-publish-flow", condition = { env_true = ["CARGO_MAKE_CRATE_IS_WORKSPACE"] } },