From c23e3f8586964c655744bb8d20d7377210bc4ecb Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 10 Jul 2025 07:06:53 -0700 Subject: [PATCH] ci: update sequoia builders to xcode 26 beta 3, output version in CI The `-edge` variant of these builders will always use the latest macOS images that may not be stable. We'll remove this once Xcode 26 is released. --- .github/workflows/release-pr.yml | 4 ++-- .github/workflows/release-tip.yml | 15 ++++++++++++--- .github/workflows/test.yml | 9 ++++++--- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml index 7f48d109f..a4bf69b1c 100644 --- a/.github/workflows/release-pr.yml +++ b/.github/workflows/release-pr.yml @@ -47,7 +47,7 @@ jobs: sentry-cli dif upload --project ghostty --wait dsym.zip build-macos: - runs-on: namespace-profile-ghostty-macos-sequoia + runs-on: namespace-profile-ghostty-macos-sequoia-edge timeout-minutes: 90 steps: - name: Checkout code @@ -201,7 +201,7 @@ jobs: destination-dir: ./ build-macos-debug: - runs-on: namespace-profile-ghostty-macos-sequoia + runs-on: namespace-profile-ghostty-macos-sequoia-edge timeout-minutes: 90 steps: - name: Checkout code diff --git a/.github/workflows/release-tip.yml b/.github/workflows/release-tip.yml index 941aed6e5..a9cff9a2b 100644 --- a/.github/workflows/release-tip.yml +++ b/.github/workflows/release-tip.yml @@ -154,7 +154,7 @@ jobs: ) }} - runs-on: namespace-profile-ghostty-macos-sequoia + runs-on: namespace-profile-ghostty-macos-sequoia-edge timeout-minutes: 90 steps: - name: Checkout code @@ -175,6 +175,9 @@ jobs: - name: XCode Select run: sudo xcode-select -s /Applications/Xcode_26.0.app + - name: Xcode Version + run: xcodebuild -version + # Setup Sparkle - name: Setup Sparkle env: @@ -371,7 +374,7 @@ jobs: ) }} - runs-on: namespace-profile-ghostty-macos-sequoia + runs-on: namespace-profile-ghostty-macos-sequoia-edge timeout-minutes: 90 steps: - name: Checkout code @@ -392,6 +395,9 @@ jobs: - name: XCode Select run: sudo xcode-select -s /Applications/Xcode_26.0.app + - name: Xcode Version + run: xcodebuild -version + # Setup Sparkle - name: Setup Sparkle env: @@ -548,7 +554,7 @@ jobs: ) }} - runs-on: namespace-profile-ghostty-macos-sequoia + runs-on: namespace-profile-ghostty-macos-sequoia-edge timeout-minutes: 90 steps: - name: Checkout code @@ -569,6 +575,9 @@ jobs: - name: XCode Select run: sudo xcode-select -s /Applications/Xcode_26.0.app + - name: Xcode Version + run: xcodebuild -version + # Setup Sparkle - name: Setup Sparkle env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cf3d983c0..93ae9734f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -270,7 +270,7 @@ jobs: ghostty-source.tar.gz build-macos: - runs-on: namespace-profile-ghostty-macos-sequoia + runs-on: namespace-profile-ghostty-macos-sequoia-edge needs: test steps: - name: Checkout code @@ -288,6 +288,9 @@ jobs: - name: Xcode Select run: sudo xcode-select -s /Applications/Xcode_26.0.app + - name: Xcode Version + run: xcodebuild -version + - name: get the Zig deps id: deps run: nix build -L .#deps && echo "deps=$(readlink ./result)" >> $GITHUB_OUTPUT @@ -350,7 +353,7 @@ jobs: xcodebuild -target Ghostty-iOS "CODE_SIGNING_ALLOWED=NO" build-macos-matrix: - runs-on: namespace-profile-ghostty-macos-sequoia + runs-on: namespace-profile-ghostty-macos-sequoia-edge needs: test steps: - name: Checkout code @@ -614,7 +617,7 @@ jobs: nix develop -c zig build -Dsentry=${{ matrix.sentry }} test-macos: - runs-on: namespace-profile-ghostty-macos-sequoia + runs-on: namespace-profile-ghostty-macos-sequoia-edge needs: test steps: - name: Checkout code