Skip to content

Increase priority of manually-installed platform. #2810

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

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

Increase priority of manually-installed platform. #2810

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
12e6f5e
Simplified platforms loader using a 'managed' flag
cmaglie Dec 2, 2024
10ad7de
Added integration test
cmaglie Dec 3, 2024
794a000
Manually installed platforms should not have version info
cmaglie Dec 3, 2024
a74ddd9
Moved code in a more logical grouping
cmaglie Dec 3, 2024
949f83a
Renamed a couple of variables for clarity
cmaglie Dec 3, 2024
3ce0ffd
draft
cmaglie Dec 10, 2024
39383d4
Fixed unit test
cmaglie Jan 16, 2025
dd727cf
Fixed Explorer.IsManagedPlatformRelease
cmaglie Feb 3, 2025
3620a0d
Fix output of 'core uninstall' completion
cmaglie Feb 4, 2025
13342eb
Fixed unit tests
cmaglie Jan 16, 2025
dad5063
Fixed integration test
cmaglie Jan 16, 2025
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
Prev Previous commit
Next Next commit
Fixed unit test
  • Loading branch information
@cmaglie
cmaglie committed Feb 4, 2025
commit 39383d4a19c75a0517d48a2516babce905d51a2d
2 changes: 1 addition & 1 deletion commands/service_debug_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestGetCommandLine(t *testing.T) {
sketchPath := paths.New("testdata", "debug", sketch)
require.NoError(t, sketchPath.ToAbs())

pmb := packagemanager.NewBuilder(nil, nil, nil, nil, nil, "test", downloader.GetDefaultConfig())
pmb := packagemanager.NewBuilder(nil, nil, customHardware, nil, nil, "test", downloader.GetDefaultConfig())
pmb.LoadHardwareFromDirectory(customHardware)
pmb.LoadHardwareFromDirectory(dataDir)

Expand Down
8 changes: 6 additions & 2 deletions internal/arduino/cores/packagemanager/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,12 @@ func (pm *Builder) LoadHardwareFromDirectory(path *paths.Path) []error {
// If the hardware directory is inside, or equals, the sketchbook/hardware directory
// it's not a managed package, otherwise it is.
managed := true
if userInstalled, err := path.IsInsideDir(pm.userPackagesDir.Parent()); err == nil && userInstalled {
managed = false
if pm.userPackagesDir != nil {
if path.EquivalentTo(pm.userPackagesDir) {
managed = false
} else if userInstalled, err := path.IsInsideDir(pm.userPackagesDir); err == nil && userInstalled {
managed = false
}
}

// Scan subdirs
Expand Down