Skip to content

Commit cbb9d19

Browse files
authored
Always set the versioned runtime.tool property for all installed tools (#1106)
For example if we have bossac 1.7.1 and 1.9.0 installed, this will result in the following properties available during upload: {runtime.tools.bossac-1.7.0-arduino3.path} => /path/to/bossac/1.7.0 {runtime.tools.bossac-1.9.0-arduino3.path} => /path/to/bossac/1.9.0 {runtime.tools.bossac.path} => /path/to/bossac/1.9.0 some platforms fails to correctly specify the version of the tool in the package_index.json but they do the correct specification in the recipes. This patch allows to not fail in this latter case.
1 parent e20cbc1 commit cbb9d19

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

commands/upload/upload.go

+3
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,9 @@ func runProgramAction(pm *packagemanager.PackageManager,
213213
uploadProperties.Merge(programmer.Properties)
214214
}
215215

216+
for _, tool := range pm.GetAllInstalledToolsReleases() {
217+
uploadProperties.Merge(tool.RuntimeProperties())
218+
}
216219
if requiredTools, err := pm.FindToolsRequiredForBoard(board); err == nil {
217220
for _, requiredTool := range requiredTools {
218221
logrus.WithField("tool", requiredTool).Info("Tool required for upload")

0 commit comments

Comments
 (0)