From 60539e94dc31d436d180f570ca62ba796003f1d2 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Sun, 8 Oct 2023 16:24:17 -0400 Subject: [PATCH] ci: bump cargo-semver-checks to 0.24.0 Also remove workaround since the issue was fixed in upstream. --- .github/workflows/main.yml | 2 +- crates/xtask-bump-check/src/xtask.rs | 18 ++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1355469a2a0..2dcd295c940 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/crates/xtask-bump-check/src/xtask.rs b/crates/xtask-bump-check/src/xtask.rs index 4bf3f03d5af..453551109fe 100644 --- a/crates/xtask-bump-check/src/xtask.rs +++ b/crates/xtask-bump-check/src/xtask.rs @@ -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()?; @@ -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()?; }