-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Added possibility to specify platform for dev command #3245
Closed
Closed
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d718173
Update build.go
PylotLight 8505774
Fix platform/arch target check
PylotLight c28cb32
Merge branch 'fix-dev-platform' into master
PylotLight 775b0b2
Merge master updates
PylotLight b720888
Revert "Merge master updates"
PylotLight dea4036
Merge pull request #2 from PylotLight/revert-1-master
PylotLight File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -62,42 +62,21 @@ func (t Target) String() string { | |
return t.Platform | ||
} | ||
|
||
func parseTargets(platform string) TargetsCollection { | ||
allowedPlatforms := map[string]bool{ | ||
"windows": true, | ||
"linux": true, | ||
"darwin": true, | ||
} | ||
|
||
if !allowedPlatforms[platform] { | ||
pterm.Error.Println("platform argument must be one of 'windows', 'linux', or 'darwin'") | ||
os.Exit(1) | ||
} | ||
|
||
var result []Target | ||
var targets slicer.StringSlicer | ||
|
||
targets.AddSlice(strings.Split(platform, ",")) | ||
targets.Deduplicate() | ||
|
||
targets.Each(func(platform string) { | ||
target := Target{ | ||
Platform: "", | ||
Arch: "", | ||
} | ||
|
||
platformSplit := strings.Split(platform, "/") | ||
|
||
target.Platform = platformSplit[0] | ||
|
||
if len(platformSplit) > 1 { | ||
target.Arch = platformSplit[1] | ||
} else { | ||
target.Arch = defaultTarget().Arch | ||
func parseTargets(platforms string) TargetsCollection { | ||
platformList := strings.Split(platforms, ",") | ||
|
||
var targets []Target | ||
|
||
for _, platform := range platformList { | ||
parts := strings.Split(platform, "/") | ||
if len(parts) == 1 { | ||
architecture := defaultTarget().Arch | ||
targets = append(targets, Target{Platform: parts[0], Arch: architecture}) | ||
} else if len(parts) == 2 { | ||
targets = append(targets, Target{Platform: parts[0], Arch: parts[1]}) | ||
} | ||
} | ||
|
||
result = append(result, target) | ||
}) | ||
|
||
return result | ||
return targets | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The refactoring of |
||
} | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The implementation of the
DryRun
flag correctly skips the build process when set. However, consider moving the check forDryRun
to an earlier stage in the function to avoid unnecessary processing before deciding not to perform the build.