Repository navigation
Conversation
Move every job in rebase.yml and create-quarterly-feature.yml off GitHub-hosted ubuntu-latest and onto the org's self-hosted runners in group triton. APP is the one label shared by all six runners (three in DA3, three in IAD39). GitHub-hosted runners start each job on a fresh VM. Self-hosted runners keep the workspace, and these jobs assume a clean one: git remote add netbsd fails once the remote exists, and a cancelled or conflicted rebase blocks every later run on that runner. Add a step before checkout to abort any rebase or merge in progress, remove the netbsd remote and drop the submodule checkouts. Keeping .git means later runs fetch only what changed rather than the whole repository.
ncalvas
force-pushed
the
ci/self-hosted-runners
branch
2 times, most recently
from
September 24, 2026 15:12
240893c to
51c8c61
Compare
github-actions
Bot
force-pushed
the
trunk
branch
25 times, most recently
from
September 26, 2026 16:31
e32aab4 to
595be89
Compare
github-actions
Bot
force-pushed
the
trunk
branch
30 times, most recently
from
October 1, 2026 05:30
8eb0399 to
90cae48
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
.github/workflows/rebase.yml(features,illumos,macos) and.github/workflows/create-quarterly-feature.yml(create-features) on the self-hosted runners instead of GitHub-hostedubuntu-latestruns-on: { group: triton, labels: [self-hosted, APP] }actions/checkoutin each jobContext
The
tritonrunner group has six self-hosted runners, three in DA3 and three in IAD39. All six carry theAPPlabel, so any job can run on any of them.GitHub-hosted runners give every job a fresh VM. Self-hosted runners keep the workspace between jobs, and these workflows assume a clean one.
git remote add netbsdfails once the remote exists. A run that is cancelled (cancel-in-progress: true) or hits a rebase conflict leaves a rebase in progress, which blocks every later run on that runner.The new step fixes this. If a
.gitdirectory exists, it aborts any rebase or merge in progress, removes thenetbsdremote, and deletes.git/modulesplus theextra,joyentandwipsubmodule checkouts.actions/checkoutthen cleans and resets the tree as usual.Notes
.gitbetween runs rather than wiping the workspace each job. Later runs fetch only what changed instead of recloning the ~1.9 GB repo. Wiping every job, as GitHub-hosted runners effectively do, would be about 8 full clones an hour (~300 GB a day) into our DCs. The trade-off is that correctness depends on the reset step catching all leftover state. If that proves fragile, switch to wiping the workspace at the start of each job.Rebase branches against NetBSDruns, especially the second run on each runner, since that is the first one to reuse a workspace.tritonmust allow this repo and must have "Allow public repositories" turned on, becausepkgsrcis public. I couldn't check this without org admin. If jobs wait in the queue, this is the cause.scheduleandworkflow_dispatch, so outside contributors can't trigger them. Do not addpull_requesttriggers without first requiring approval for outside contributors.trunkis force-pushed every hour by the rebase job itself. Merge this promptly, or rebase the branch onto the latesttrunkright before merging. Otherwise the PR base will have been rewritten under it. Prefer "Rebase and merge" so no merge commit lands ontrunk.rebase.ymlstarts 6featuresjobs at once, and there are 6 runners, so they fit with no spare.