From ec0dc11b433529beb13f71cedc9ca42fda296d1c Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Sat, 12 Sep 2026 09:00:23 +0000 Subject: [PATCH] Print macOS SDK version when bundling (#64119) A preparation for solving https://github.com/zed-industries/zed/issues/9307#issuecomment-4712583548 and other SDK-related issues. Release Notes: - N/A --- .github/workflows/release.yml | 22 +++++++++++++++++++ .github/workflows/release_nightly.yml | 22 +++++++++++++++++++ .github/workflows/run_bundling.yml | 22 +++++++++++++++++++ .../xtask/src/tasks/workflows/run_bundling.rs | 15 +++++++++++++ 4 files changed, 81 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 037bc5bda5..58d4eeaaa6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -569,6 +569,17 @@ jobs: token: ${{ secrets.SENTRY_AUTH_TOKEN }} - name: steps::clear_target_dir_if_large run: ./script/clear-target-dir-if-larger-than 350 200 + - name: run_bundling::bundle_mac::print_macos_toolchain + run: | + sw_vers + xcode-select -p + xcodebuild -version + xcrun --sdk macosx --show-sdk-version + xcrun --sdk macosx --show-sdk-path + xcrun clang --version + printf 'DEVELOPER_DIR=%s\n' "${DEVELOPER_DIR-}" + printf 'SDKROOT=%s\n' "${SDKROOT-}" + printf 'MACOSX_DEPLOYMENT_TARGET=%s\n' "${MACOSX_DEPLOYMENT_TARGET-}" - name: run_bundling::bundle_mac::bundle_mac run: ./script/bundle-mac aarch64-apple-darwin - name: run_bundling::upload_artifact @@ -621,6 +632,17 @@ jobs: token: ${{ secrets.SENTRY_AUTH_TOKEN }} - name: steps::clear_target_dir_if_large run: ./script/clear-target-dir-if-larger-than 350 200 + - name: run_bundling::bundle_mac::print_macos_toolchain + run: | + sw_vers + xcode-select -p + xcodebuild -version + xcrun --sdk macosx --show-sdk-version + xcrun --sdk macosx --show-sdk-path + xcrun clang --version + printf 'DEVELOPER_DIR=%s\n' "${DEVELOPER_DIR-}" + printf 'SDKROOT=%s\n' "${SDKROOT-}" + printf 'MACOSX_DEPLOYMENT_TARGET=%s\n' "${MACOSX_DEPLOYMENT_TARGET-}" - name: run_bundling::bundle_mac::bundle_mac run: ./script/bundle-mac x86_64-apple-darwin - name: run_bundling::upload_artifact diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml index 45cc17f970..2ec6a4128e 100644 --- a/.github/workflows/release_nightly.yml +++ b/.github/workflows/release_nightly.yml @@ -300,6 +300,17 @@ jobs: token: ${{ secrets.SENTRY_AUTH_TOKEN }} - name: steps::clear_target_dir_if_large run: ./script/clear-target-dir-if-larger-than 350 200 + - name: run_bundling::bundle_mac::print_macos_toolchain + run: | + sw_vers + xcode-select -p + xcodebuild -version + xcrun --sdk macosx --show-sdk-version + xcrun --sdk macosx --show-sdk-path + xcrun clang --version + printf 'DEVELOPER_DIR=%s\n' "${DEVELOPER_DIR-}" + printf 'SDKROOT=%s\n' "${SDKROOT-}" + printf 'MACOSX_DEPLOYMENT_TARGET=%s\n' "${MACOSX_DEPLOYMENT_TARGET-}" - name: run_bundling::bundle_mac::bundle_mac run: ./script/bundle-mac aarch64-apple-darwin - name: run_bundling::upload_artifact @@ -356,6 +367,17 @@ jobs: token: ${{ secrets.SENTRY_AUTH_TOKEN }} - name: steps::clear_target_dir_if_large run: ./script/clear-target-dir-if-larger-than 350 200 + - name: run_bundling::bundle_mac::print_macos_toolchain + run: | + sw_vers + xcode-select -p + xcodebuild -version + xcrun --sdk macosx --show-sdk-version + xcrun --sdk macosx --show-sdk-path + xcrun clang --version + printf 'DEVELOPER_DIR=%s\n' "${DEVELOPER_DIR-}" + printf 'SDKROOT=%s\n' "${SDKROOT-}" + printf 'MACOSX_DEPLOYMENT_TARGET=%s\n' "${MACOSX_DEPLOYMENT_TARGET-}" - name: run_bundling::bundle_mac::bundle_mac run: ./script/bundle-mac x86_64-apple-darwin - name: run_bundling::upload_artifact diff --git a/.github/workflows/run_bundling.yml b/.github/workflows/run_bundling.yml index a16651db4b..a697d96f2c 100644 --- a/.github/workflows/run_bundling.yml +++ b/.github/workflows/run_bundling.yml @@ -204,6 +204,17 @@ jobs: token: ${{ secrets.SENTRY_AUTH_TOKEN }} - name: steps::clear_target_dir_if_large run: ./script/clear-target-dir-if-larger-than 350 200 + - name: run_bundling::bundle_mac::print_macos_toolchain + run: | + sw_vers + xcode-select -p + xcodebuild -version + xcrun --sdk macosx --show-sdk-version + xcrun --sdk macosx --show-sdk-path + xcrun clang --version + printf 'DEVELOPER_DIR=%s\n' "${DEVELOPER_DIR-}" + printf 'SDKROOT=%s\n' "${SDKROOT-}" + printf 'MACOSX_DEPLOYMENT_TARGET=%s\n' "${MACOSX_DEPLOYMENT_TARGET-}" - name: run_bundling::bundle_mac::bundle_mac run: ./script/bundle-mac aarch64-apple-darwin - name: run_bundling::upload_artifact @@ -255,6 +266,17 @@ jobs: token: ${{ secrets.SENTRY_AUTH_TOKEN }} - name: steps::clear_target_dir_if_large run: ./script/clear-target-dir-if-larger-than 350 200 + - name: run_bundling::bundle_mac::print_macos_toolchain + run: | + sw_vers + xcode-select -p + xcodebuild -version + xcrun --sdk macosx --show-sdk-version + xcrun --sdk macosx --show-sdk-path + xcrun clang --version + printf 'DEVELOPER_DIR=%s\n' "${DEVELOPER_DIR-}" + printf 'SDKROOT=%s\n' "${SDKROOT-}" + printf 'MACOSX_DEPLOYMENT_TARGET=%s\n' "${MACOSX_DEPLOYMENT_TARGET-}" - name: run_bundling::bundle_mac::bundle_mac run: ./script/bundle-mac x86_64-apple-darwin - name: run_bundling::upload_artifact diff --git a/tooling/xtask/src/tasks/workflows/run_bundling.rs b/tooling/xtask/src/tasks/workflows/run_bundling.rs index cb916e849e..2bba6c215f 100644 --- a/tooling/xtask/src/tasks/workflows/run_bundling.rs +++ b/tooling/xtask/src/tasks/workflows/run_bundling.rs @@ -62,6 +62,20 @@ pub(crate) fn bundle_mac( release_channel: Option, deps: &[&NamedJob], ) -> NamedJob { + pub fn print_macos_toolchain() -> Step { + named::bash(indoc! {r#" + sw_vers + xcode-select -p + xcodebuild -version + xcrun --sdk macosx --show-sdk-version + xcrun --sdk macosx --show-sdk-path + xcrun clang --version + printf 'DEVELOPER_DIR=%s\n' "${DEVELOPER_DIR-}" + printf 'SDKROOT=%s\n' "${SDKROOT-}" + printf 'MACOSX_DEPLOYMENT_TARGET=%s\n' "${MACOSX_DEPLOYMENT_TARGET-}" + "#}) + } + pub fn bundle_mac(arch: Arch) -> Step { named::bash(&format!("./script/bundle-mac {arch}-apple-darwin")) } @@ -87,6 +101,7 @@ pub(crate) fn bundle_mac( .add_step(steps::setup_node()) .add_step(steps::setup_sentry()) .add_step(steps::clear_target_dir_if_large(runners::Platform::Mac)) + .add_step(print_macos_toolchain()) .add_step(bundle_mac(arch)) .add_step(upload_artifact(&format!( "target/{arch}-apple-darwin/release/{artifact_name}"