Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[beta] backports #121069

Merged
merged 9 commits into from
Feb 16, 2024
Prev Previous commit
Next Next commit
Require that SELECT_XCODE is set.
Allowing the Xcode version to "float" based on whatever default GitHub
selects creates an unreliable environment. When GitHub changes the
default, we can have multiple jobs in the same run using different
versions as it rolls out across machines. It can also cause oscillation
between runs as different machines are used. It also causes
unpredictable timing when the updates happen.

This change helps ensure that the version that is used is pinned. The
downside is that it requires manually bumping the version, and the risk
that if we take too long, older Xcodes will be removed and that will
break the build.

(cherry picked from commit 4ce1f1c)
ehuss authored and cuviper committed Feb 15, 2024
commit 5df5175361a3d99804bfc45c2da06dadc65cdc94
4 changes: 1 addition & 3 deletions src/ci/scripts/select-xcode.sh
Original file line number Diff line number Diff line change
@@ -7,7 +7,5 @@ IFS=$'\n\t'
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"

if isMacOS; then
if [[ -s "${SELECT_XCODE-}" ]]; then
sudo xcode-select -s "${SELECT_XCODE}"
fi
sudo xcode-select -s "${SELECT_XCODE}"
fi