Skip to content

feat: build job limit #122

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
raphaelcoeffic merged 1 commit into from
Aug 18, 2025
Merged

feat: build job limit #122

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func Build(
defer os.RemoveAll(sourceDir)
recorder := buildlogs.NewRecorder()
gitDownloader := source.NewGitDownloader(sourceDir, recorder)
firmwareBuilder := firmware.NewPodmanBuilder(sourceDir, recorder, runtime.NumCPU()/2, 1024*1024*1024*2)
firmwareBuilder := firmware.NewPodmanBuilder(sourceDir, recorder, runtime.NumCPU(), 1024*1024*1024*2)

err = gitDownloader.Download(ctx, sourceRepository, commitHash)
if err != nil {
Expand Down
3 changes: 1 addition & 2 deletions firmware/podman_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ type PodmanBuilder struct {
workingDir string
PodmanExecutor PodmanExecutor
CPULimit int // logical cores
MemoryLimit int // bytes
recorder *buildlogs.Recorder
}

Expand All @@ -37,7 +36,6 @@ func NewPodmanBuilder(workingDir string, recorder *buildlogs.Recorder, cpuLimit
workingDir: workingDir,
PodmanExecutor: DefaultPodmanExecutor(workingDir),
CPULimit: cpuLimit,
MemoryLimit: memoryLimit,
recorder: recorder,
}
}
Expand Down Expand Up @@ -71,6 +69,7 @@ func (builder *PodmanBuilder) buildCmdArgs(
env := []string{
fmt.Sprintf("FLAVOR=%s", target),
fmt.Sprintf("EXTRA_OPTIONS=%s", CmakeFlags(flags)),
fmt.Sprintf("MAX_JOBS=%d", builder.CPULimit),
}
if versionTag == "nightly" {
env = append(env, "EDGETX_VERSION_SUFFIX=nightly")
Expand Down
3 changes: 2 additions & 1 deletion firmware/podman_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package firmware_test
import (
"context"
"os"
"runtime"
"testing"
"time"

Expand All @@ -28,7 +29,7 @@ func TestFirmwareFirmwareBuild(t *testing.T) {
assert.Nil(t, err, "failed to download firmware")
t.Log("will start firmware build")

firmwareBuilder := firmware.NewPodmanBuilder(sourceDir, recorder, 2, 1024*1024*1024)
firmwareBuilder := firmware.NewPodmanBuilder(sourceDir, recorder, runtime.NumCPU(), 1024*1024*1024)
flags := []firmware.BuildFlag{
firmware.NewFlag("DISABLE_COMPANION", "YES"),
firmware.NewFlag("CMAKE_BUILD_TYPE", "Release"),
Expand Down
5 changes: 3 additions & 2 deletions processor/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package processor
import (
"context"
"os"
"runtime"
"time"

"github.com/edgetx/cloudbuild/artifactory"
Expand Down Expand Up @@ -39,7 +40,7 @@ func (worker *Worker) build(

recorder := buildlogs.NewRecorder()
gitDownloader := source.NewGitDownloader(sourceDir, recorder)
firmwareBuilder := firmware.NewPodmanBuilder(sourceDir, recorder, 4, 2*1024*1024*1024)
firmwareBuilder := firmware.NewPodmanBuilder(sourceDir, recorder, runtime.NumCPU(), 2*1024*1024*1024)

return worker.artifactory.Build(
ctx, job, recorder, gitDownloader, firmwareBuilder,
Expand Down Expand Up @@ -73,7 +74,7 @@ func (worker *Worker) PullImage(ctx context.Context, buildImage string) error {
We do this so actual build process is faster because of the cached build image
*/
recorder := buildlogs.NewRecorder()
firmwareBuilder := firmware.NewPodmanBuilder("/tmp", recorder, 4, 1024*1024*1024)
firmwareBuilder := firmware.NewPodmanBuilder("/tmp", recorder, runtime.NumCPU(), 1024*1024*1024)
ctx, cancel := context.WithTimeout(ctx, artifactory.MaxBuildDuration)
defer cancel()

Expand Down