fix CI: replace removed macOS runner, deprecated use of Command::cargo_bin() (#4134)

* fix(ci): update macOS intel runner version

* fix(cli/tests): replace use of deprecated `Command::cargo_bin()`

.github/workflows/sqlx-cli.yml

@@ -45,7 +45,7 @@ jobs:
           - ubuntu-latest
           # FIXME: migrations tests fail on Windows for whatever reason
           # - windows-latest
-          - macOS-13
+          - macOS-15-intel
           - macOS-latest
 
     timeout-minutes: 30
@@ -302,7 +302,7 @@ jobs:
         os:
           - ubuntu-latest
           - windows-latest
-          - macOS-13
+          - macOS-15-intel
           - macOS-latest
         include:
           - os: ubuntu-latest
@@ -312,7 +312,7 @@ jobs:
           - os: windows-latest
             target: x86_64-pc-windows-msvc
             bin: target/debug/cargo-sqlx.exe
-          - os: macOS-13
+          - os: macOS-15-intel
             target: x86_64-apple-darwin
             bin: target/debug/cargo-sqlx
           - os: macOS-latest

Cargo.lock

@@ -151,13 +151,12 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "assert_cmd"
-version = "2.0.17"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd389a4b2970a01282ee455294913c0a43724daedcd1a24c3eb0ec1c1320b66"
+checksum = "bcbb6924530aa9e0432442af08bbcafdad182db80d2e560da42a6d442535bf85"
 dependencies = [
  "anstyle",
  "bstr",
- "doc-comment",
  "libc",
  "predicates 3.1.3",
  "predicates-core",
@@ -1229,12 +1228,6 @@ dependencies = [
  "syn 2.0.104",
 ]
 
-[[package]]
-name = "doc-comment"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
-
 [[package]]
 name = "dotenvy"
 version = "0.15.7"

sqlx-cli/Cargo.toml

@@ -76,7 +76,7 @@ sqlx-toml = ["sqlx/sqlx-toml"]
 _sqlite = []
 
 [dev-dependencies]
-assert_cmd = "2.0.11"
+assert_cmd = "2.1.1"
 tempfile = "3.10.1"
 
 [lints]

sqlx-cli/tests/add.rs

@@ -1,5 +1,5 @@
 use anyhow::Context;
-use assert_cmd::Command;
+use assert_cmd::cargo_bin_cmd;
 use std::cmp::Ordering;
 use std::fs::read_dir;
 use std::ops::Index;
@@ -117,7 +117,7 @@ impl AddMigrations {
         sequential: bool,
         expect_success: bool,
     ) -> anyhow::Result<&'_ Self> {
-        let cmd_result = Command::cargo_bin("cargo-sqlx")?
+        let cmd_result = cargo_bin_cmd!("cargo-sqlx")
             .current_dir(&self.tempdir)
             .args(
                 [