Skip to content

Add multi platforms support for RepoOutDir #1004

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.

Sign up for GitHub

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

Open
TrevorTaoARM wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add multi platforms support for RepoOutDir #1004

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkg/model/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ package model

import (
"encoding/json"
"fmt"
"path"
"runtime"
)

type (
Expand Down Expand Up @@ -183,12 +185,12 @@ func (m Manifest) RepoDir(repo string) string {

// GoOutDir is a helper to return the directory of Istio build output
func (m Manifest) GoOutDir() string {
return path.Join(m.Directory, "work", "out", "linux_amd64", "release")
return path.Join(m.Directory, "work", "out", fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH), "release")
}

// RepoOutDir is a helper to return the directory of Istio build output for repos the place outputs inside the repo
func (m Manifest) RepoOutDir(repo string) string {
return path.Join(m.Directory, "work", "src", "istio.io", repo, "out", "linux_amd64", "release")
return path.Join(m.Directory, "work", "src", "istio.io", repo, "out", fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH), "release")
}

// WorkDir is a help to return the work directory
Expand Down