From 6cc9969981f46e29d6883b04e0486fda17fe6900 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 1 May 2025 11:18:37 -0400
Subject: [PATCH 1/3] services/nomad/build/buildbot: sort packages before
 printing

this should fix ordering issues with split logs
---
 services/nomad/build/buildbot.cfg | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/services/nomad/build/buildbot.cfg b/services/nomad/build/buildbot.cfg
index cbcc47f9..892e0097 100644
--- a/services/nomad/build/buildbot.cfg
+++ b/services/nomad/build/buildbot.cfg
@@ -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',

From 3226580607bb6dc853be4b223a4c2a2ec3859260 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 2 May 2025 00:51:36 -0400
Subject: [PATCH 2/3] services/nomad/build/buildbot: re-increase ram for
 buildbot controller

might help with some issues seen?
---
 services/nomad/build/buildbot.nomad | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/nomad/build/buildbot.nomad b/services/nomad/build/buildbot.nomad
index 243f12b1..ae1b692f 100644
--- a/services/nomad/build/buildbot.nomad
+++ b/services/nomad/build/buildbot.nomad
@@ -65,7 +65,7 @@ job "buildbot" {
       }
 
       resources {
-        memory = 1024
+        memory = 2048
       }
 
       meta {

From bc270ad4d5aeada1d18a942d43ca4cb96b01d0de Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 3 May 2025 12:28:25 -0400
Subject: [PATCH 3/3] services/pkg/buildbot-builder: update go-xbps-src

---
 services/pkg/buildbot-builder/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/pkg/buildbot-builder/Dockerfile b/services/pkg/buildbot-builder/Dockerfile
index b00da1cc..dfaaeb50 100644
--- a/services/pkg/buildbot-builder/Dockerfile
+++ b/services/pkg/buildbot-builder/Dockerfile
@@ -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