Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Print macOS SDK version when bundling (#64119)
Kirill Bulatov9d272b036335
diff --git a/.github/workflows/release.yml b/.github/workflows/release.ymlindex 037bc5bda53..58d4eeaaa65 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_largerun: ./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-<unset>}"+ printf 'SDKROOT=%s\n' "${SDKROOT-<unset>}"+ printf 'MACOSX_DEPLOYMENT_TARGET=%s\n' "${MACOSX_DEPLOYMENT_TARGET-<unset>}"- name: run_bundling::bundle_mac::bundle_macrun: ./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_largerun: ./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-<unset>}"+ printf 'SDKROOT=%s\n' "${SDKROOT-<unset>}"+ printf 'MACOSX_DEPLOYMENT_TARGET=%s\n' "${MACOSX_DEPLOYMENT_TARGET-<unset>}"- name: run_bundling::bundle_mac::bundle_macrun: ./script/bundle-mac x86_64-apple-darwin- name: run_bundling::upload_artifactdiff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.ymlindex 45cc17f9706..2ec6a4128ed 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_largerun: ./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-<unset>}"+ printf 'SDKROOT=%s\n' "${SDKROOT-<unset>}"+ printf 'MACOSX_DEPLOYMENT_TARGET=%s\n' "${MACOSX_DEPLOYMENT_TARGET-<unset>}"- name: run_bundling::bundle_mac::bundle_macrun: ./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_largerun: ./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-<unset>}"+ printf 'SDKROOT=%s\n' "${SDKROOT-<unset>}"+ printf 'MACOSX_DEPLOYMENT_TARGET=%s\n' "${MACOSX_DEPLOYMENT_TARGET-<unset>}"- name: run_bundling::bundle_mac::bundle_macrun: ./script/bundle-mac x86_64-apple-darwin- name: run_bundling::upload_artifactdiff --git a/.github/workflows/run_bundling.yml b/.github/workflows/run_bundling.ymlindex a16651db4b4..a697d96f2c1 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_largerun: ./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-<unset>}"+ printf 'SDKROOT=%s\n' "${SDKROOT-<unset>}"+ printf 'MACOSX_DEPLOYMENT_TARGET=%s\n' "${MACOSX_DEPLOYMENT_TARGET-<unset>}"- name: run_bundling::bundle_mac::bundle_macrun: ./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_largerun: ./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-<unset>}"+ printf 'SDKROOT=%s\n' "${SDKROOT-<unset>}"+ printf 'MACOSX_DEPLOYMENT_TARGET=%s\n' "${MACOSX_DEPLOYMENT_TARGET-<unset>}"- name: run_bundling::bundle_mac::bundle_macrun: ./script/bundle-mac x86_64-apple-darwin- name: run_bundling::upload_artifactdiff --git a/tooling/xtask/src/tasks/workflows/run_bundling.rs b/tooling/xtask/src/tasks/workflows/run_bundling.rsindex cb916e849ed..2bba6c215f8 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<ReleaseChannel>,deps: &[&NamedJob],) -> NamedJob {+ pub fn print_macos_toolchain() -> Step<Run> {+ 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-<unset>}"+ printf 'SDKROOT=%s\n' "${SDKROOT-<unset>}"+ printf 'MACOSX_DEPLOYMENT_TARGET=%s\n' "${MACOSX_DEPLOYMENT_TARGET-<unset>}"+ "#})+ }+pub fn bundle_mac(arch: Arch) -> Step<Run> {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}"