Repository navigation
builder-upgrade: fall back to the ronin CLT dmg when softwareupdate has none - #95
Merged
Merged
Conversation
…as none softwareupdate on r8-198 listed no Command Line Tools at all, only the 15.8.2 update, so the CLT step could never finish. Install the 16.4 dmg ronin ships instead, and only if the pkg inside reports "signed Apple Software".
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
On r8-198 (macOS 15.8.1, Xcode 16.4 already installed)
softwareupdateoffered no Command Line Tools at all, with the install-on-demand trigger in place, sostep_install_cltcould never finish. Puppet'smacos_xcode_toolsexec does the same lookup and would fail the same way.When softwareupdate doesn't produce
usr/bin/git, installCommand_Line_Tools_for_Xcode_16.4.dmgfrom the ronin package bucket (the filepackages::xcode_cmd_line_toolsuses). It's only installed ifpkgutil --check-signaturereportssigned Apple Software; the dmg is always detached and deleted. Done this way by hand on r8-198 today, then puppet ran clean.Tests cover the softwareupdate path, the dmg fallback, and refusing an unsigned pkg.