STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9650 from timrogers/timrogers/log-platform-fallback

Browse source 
Emit a log message when extension installation falls back to a `darwin-amd64` binary on an Apple Silicon macOS device
This commit is contained in:
Tyler McGoffin 2024-10-03 10:19:14 -07:00 • committed by GitHub
commit 9bd75d23ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkg/cmd/extension/manager.go
View file

@ -29,6 +29,8 @@ import (
// ErrInitialCommitFailed indicates the initial commit when making a new extension failed.
var ErrInitialCommitFailed = errors.New("initial commit failed")
const darwinAmd64 = "darwin-amd64"
type Manager struct {
dataDir func() string
lookPath func(string) (string, error)
@ -266,13 +268,16 @@ func (m *Manager) installBin(repo ghrepo.Interface, target string) error {
// if using an ARM-based Mac and an arm64 binary is unavailable, fall back to amd64 if a relevant binary is available and Rosetta 2 is installed
if asset == nil && isMacARM {
for _, a := range r.Assets {
if strings.HasSuffix(a.Name, "darwin-amd64") {
if strings.HasSuffix(a.Name, darwinAmd64) {
if !hasRosetta() {
return fmt.Errorf(
"%[1]s unsupported for %[2]s. Install Rosetta with `softwareupdate --install-rosetta` to use the available darwin-amd64 binary, or open an issue: `gh issue create -R %[3]s/%[1]s -t'Support %[2]s'`",
repo.RepoName(), platform, repo.RepoOwner())
"%[1]s unsupported for %[2]s. Install Rosetta with `softwareupdate --install-rosetta` to use the available %[3]s binary, or open an issue: `gh issue create -R %[4]s/%[1]s -t'Support %[2]s'`",
repo.RepoName(), platform, darwinAmd64, repo.RepoOwner())
}
fallbackMessage := fmt.Sprintf("%[1]s not available for %[2]s. Falling back to compatible %[3]s binary", repo.RepoName(), platform, darwinAmd64)
fmt.Fprintln(m.io.Out, fallbackMessage)
asset = &a
break
}

2
pkg/cmd/extension/manager_test.go
View file

@ -1098,7 +1098,7 @@ func TestManager_Install_amd64_when_supported(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, "FAKE BINARY", string(fakeBin))
assert.Equal(t, "", stdout.String())
assert.Equal(t, "gh-bin-ext not available for darwin-arm64. Falling back to compatible darwin-amd64 binary\n", stdout.String())
assert.Equal(t, "", stderr.String())
}