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.

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

(feat) New flag --exclude-unchanged #296

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions docs/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
| `<LEVEL>` | string | Bump specified version field. |
| `--metadata` | string | Populate the metadata field in the version. |
| `--token` | string | Token to use when running `cargo publish` |
| `--exclude-unchanged` | bool | Only act on (transitive dependencies of) packages that have changed since the previous release |

### Bump level

Expand Down
54 changes: 48 additions & 6 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::collections::HashMap;
use std::collections::HashSet;
use std::ffi::OsStr;
use std::io::Write;
use std::path::Path;
Expand Down Expand Up @@ -431,6 +432,7 @@ fn release_packages<'m>(
}

let lock_path = ws_meta.workspace_root.join("Cargo.lock");
let mut unchanged_pkgs = HashSet::new();
for pkg in pkgs {
if let Some(version) = pkg.version.as_ref() {
let cwd = pkg.package_path;
Expand Down Expand Up @@ -469,12 +471,21 @@ fn release_packages<'m>(
let _ = changed.swap_remove(lock_index);
}
if changed.is_empty() {
log::warn!(
"Updating {} to {} despite no changes made since tag {}",
crate_name,
version.version_string,
prev_tag_name
);
if args.exclude_unchanged {
unchanged_pkgs.insert(crate_name);
log::info!(
"Filtering out {} {} since it has no changes since tag {}",
crate_name,
version.version_string,
prev_tag_name);
} else {
log::warn!(
"Updating {} to {} despite no changes made since tag {}",
crate_name,
version.version_string,
prev_tag_name
);
}
} else {
log::debug!(
"Files changed in {} since {}: {:#?}",
Expand All @@ -493,6 +504,33 @@ fn release_packages<'m>(
}
}

log::debug!("Computing transitive closure of dependencies-of-changed packages");
let pkgs: &Vec<&'m PackageRelease<'m>> = {
let mut changed_pkgs: Vec<&'m PackageRelease<'m>> = pkgs.iter()
.filter(|p| !unchanged_pkgs.contains(p.meta.name.as_str()))
.copied()
.collect();
let mut i = 0;
while i < changed_pkgs.len() {
let p = changed_pkgs[i];
i += 1;
log::debug!("Considering package {} ({}/{})", p.meta.name.as_str(), i, changed_pkgs.len());
for dep in p.dependents.iter() {
if !changed_pkgs.iter().any(|p| p.meta.name.as_str() == dep.pkg.name.as_str()) {
log::debug!(" dependent package {} hasn't yet been seen", dep.pkg.name.as_str());
if let Some(dep_p) = pkgs.iter().find(|p| p.meta.name.as_str() == dep.pkg.name.as_str()) {
changed_pkgs.push(dep_p);
}
} else {
log::debug!(" dependent package {} has already been seen", dep.pkg.name.as_str());
}
}
}
&changed_pkgs.to_vec()
};
log::debug!("Final package set: {:?}",
pkgs.iter().map(|p| p.meta.name.as_str()).collect::<Vec<_>>());

let git_remote = ws_config.push_remote();
let branch = git::current_branch(ws_meta.workspace_root.as_std_path())?;
if branch == "HEAD" {
Expand Down Expand Up @@ -871,6 +909,10 @@ struct ReleaseOpt {

#[structopt(flatten)]
logging: Verbosity,

#[structopt(long)]
/// Filter the final list of packages, omitting those that have not changed since previous release
exclude_unchanged: bool,
}

#[derive(StructOpt, Debug, Clone)]
Expand Down