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()`

Author: abonander

.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

@@ -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/Cargo.toml

@@ -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(
                 [