Skip to content

services/nomad/build/buildbot: sort packages before printing #236

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
Duncaen merged 3 commits into from
May 3, 2025
Merged

services/nomad/build/buildbot: sort packages before printing #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cc9969
services/nomad/build/buildbot: sort packages before printing
classabbyamp May 1, 2025
3226580
services/nomad/build/buildbot: re-increase ram for buildbot controller
classabbyamp May 2, 2025
bc270ad
services/pkg/buildbot-builder: update go-xbps-src
classabbyamp May 3, 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
11 changes: 11 additions & 0 deletions services/nomad/build/buildbot.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,17 @@ factory.addStep(ShellCommandWithChanges(
workdir=builddir(),
))

factory.addStep(steps.ShellCommand(
command=['make', 'sort'],
name='sort_packages',
description='sorting packages to build',
descriptionDone='sorted packages',
haltOnFailure=True,
logEnviron=False,
usePTY=True,
workdir=builddir(),
))

factory.addStep(steps.SetPropertyFromCommand(
command=['make', 'print_pkgs'],
property='packages',
Expand Down
2 changes: 1 addition & 1 deletion services/nomad/build/buildbot.nomad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ job "buildbot" {
}

resources {
memory = 1024
memory = 2048
}

meta {
Expand Down
2 changes: 1 addition & 1 deletion services/pkg/buildbot-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ghcr.io/void-linux/void-glibc-full:latest AS build

RUN xbps-install -Suy xbps && xbps-install -uy git go

ARG GO_XBPS_SRC_VERSION=0411f1b69a21103ec39ae6b0160b47cfc2c3e880
ARG GO_XBPS_SRC_VERSION=aed3b4682c7b2d1e31447cdb1de60e817e4dada1

RUN env GOBIN=/usr/local/bin GOMODCACHE=/tmp/go \
go install -v github.com/Duncaen/go-xbps-src/cmd/xbps-src-make@$GO_XBPS_SRC_VERSION
Expand Down