Skip to content

In compile command try to release the package manager lock ASAP #2741

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

Merged
merged 2 commits into from
Nov 21, 2024
Merged

In compile command try to release the package manager lock ASAP #2741

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d82c3f3
In `compile` command try to release the package manager lock ASAP
cmaglie Oct 30, 2024
6cff889
Applied suggestion from code review
cmaglie Nov 21, 2024
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
17 changes: 15 additions & 2 deletions commands/service_compile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/arduino/arduino-cli/commands/internal/instances"
"github.com/arduino/arduino-cli/internal/arduino/builder"
"github.com/arduino/arduino-cli/internal/arduino/cores"
"github.com/arduino/arduino-cli/internal/arduino/cores/packagemanager"
"github.com/arduino/arduino-cli/internal/arduino/libraries/librariesmanager"
"github.com/arduino/arduino-cli/internal/arduino/sketch"
"github.com/arduino/arduino-cli/internal/arduino/utils"
Expand Down Expand Up @@ -77,9 +78,17 @@ func (s *arduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.Ardu
exportBinaries = *e
}

pme, release, err := instances.GetPackageManagerExplorer(req.GetInstance())
if err != nil {
var pme *packagemanager.Explorer
var release func()
if _pme, _release, err := instances.GetPackageManagerExplorer(req.GetInstance()); err != nil {
return err
} else {
pme = _pme
release = func() {
_release()
// Release once if called multiple times
_release = func() {}
}
}
defer release()

Expand Down Expand Up @@ -358,6 +367,10 @@ func (s *arduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.Ardu
targetBoard.String(), "'build.board'", sketchBuilder.GetBuildProperties().Get("build.board")) + "\n"))
}

// Release package manager
release()

// Perform the actual build
if err := sketchBuilder.Build(); err != nil {
return &cmderrors.CompileFailedError{Message: err.Error()}
}
Expand Down
Loading