Skip to content

Commit

Permalink
Auto merge of #12795 - weihanglo:semver-checks, r=ehuss
Browse files Browse the repository at this point in the history
ci: bump cargo-semver-checks to 0.24.0
  • Loading branch information
bors committed Oct 8, 2023
2 parents 336815a + 60539e9 commit 0871c0e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
- name: Install cargo-semver-checks
run: |
mkdir installed-bins
curl -Lf https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.22.1/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz \
curl -Lf https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.24.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz \
| tar -xz --directory=./installed-bins
echo `pwd`/installed-bins >> $GITHUB_PATH
- run: ci/validate-version-bump.sh
Expand Down
18 changes: 2 additions & 16 deletions crates/xtask-bump-check/src/xtask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,26 +148,13 @@ fn bump_check(args: &clap::ArgMatches, config: &cargo::util::Config) -> CargoRes
anyhow::bail!(msg)
}

// Tracked by https://github.com/obi1kenobi/cargo-semver-checks/issues/511
let exclude_args = [
"--exclude",
"cargo-credential-1password",
"--exclude",
"cargo-credential-libsecret",
"--exclude",
"cargo-credential-macos-keychain",
"--exclude",
"cargo-credential-wincred",
];

// Even when we test against baseline-rev, we still need to make sure a
// change doesn't violate SemVer rules against crates.io releases. The
// possibility of this happening is nearly zero but no harm to check twice.
let mut cmd = ProcessBuilder::new("cargo");
cmd.arg("semver-checks")
.arg("check-release")
.arg("--workspace")
.args(&exclude_args);
.arg("--workspace");
config.shell().status("Running", &cmd)?;
cmd.exec()?;

Expand All @@ -176,8 +163,7 @@ fn bump_check(args: &clap::ArgMatches, config: &cargo::util::Config) -> CargoRes
cmd.arg("semver-checks")
.arg("--workspace")
.arg("--baseline-rev")
.arg(referenced_commit.id().to_string())
.args(&exclude_args);
.arg(referenced_commit.id().to_string());
config.shell().status("Running", &cmd)?;
cmd.exec()?;
}
Expand Down

0 comments on commit 0871c0e

Please sign in to comment.