Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.15.0
rev: v0.16.0
hooks:
- id: ruff-check
args: [--fix]
Expand Down
2 changes: 1 addition & 1 deletion master/custom_steps.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import xml.etree.ElementTree as Xml # nosec B405

from buildbot.process.buildstep import BuildStepFailed, BuildStep, ShellMixin
from buildbot.process.buildstep import BuildStep, BuildStepFailed, ShellMixin
from buildbot.steps.worker import CompositeStepMixin
from twisted.internet import defer

Expand Down
11 changes: 5 additions & 6 deletions master/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,17 @@ from buildbot.steps.cmake import CMake
from buildbot.steps.master import SetProperties
from buildbot.steps.shell import SetPropertyFromCommand, ShellCommand
from buildbot.steps.source.github import GitHub
from buildbot.steps.worker import MakeDirectory, SetPropertiesFromEnv, RemoveDirectory
from buildbot.steps.worker import MakeDirectory, RemoveDirectory, SetPropertiesFromEnv
from buildbot.util import httpclientservice
from buildbot.worker import Worker
from buildbot.www.auth import UserPasswordAuth
from buildbot.www.authz import Authz
from buildbot.www.authz.roles import RolesFromUsername
from buildbot.www.hooks.github import GitHubEventHandler
from custom_steps import CTest
from twisted.internet.defer import inlineCallbacks
from twisted.python import log

from custom_steps import CTest

type Renderable = str | Transform | Interpolate | Property | list[Renderable] | dict[str, Renderable]


Expand Down Expand Up @@ -848,7 +847,7 @@ def add_test_steps(factory, builder_type):
# active env.
wasm_jit = None
if halide_target.startswith("wasm-"):
halide_target, sep, wasm_jit = halide_target.partition("/")
halide_target, _sep, wasm_jit = halide_target.partition("/")
# Re-set HL_JIT_TARGET with the de-warted target string
env = Merge(Property("env"), {"HL_JIT_TARGET": halide_target})
if wasm_jit:
Expand Down Expand Up @@ -1100,7 +1099,7 @@ c["schedulers"] = [
class SafeGitHubEventHandler(GitHubEventHandler):
@staticmethod
def _log(message):
log.msg(f"SafeGitHubEventHandler: {message}", logLevel=logging.DEBUG) # ty: ignore[possibly-missing-attribute]
log.msg(f"SafeGitHubEventHandler: {message}", logLevel=logging.DEBUG)

def handle_push(self, payload, event):
ref = payload["ref"]
Expand Down Expand Up @@ -1132,7 +1131,7 @@ class SafeGitHubEventHandler(GitHubEventHandler):
headers["Authorization"] = "token " + token

http = yield httpclientservice.HTTPSession(
self.master.httpservice, # ty: ignore[possibly-missing-attribute]
self.master.httpservice, # ty: ignore[unresolved-attribute]
self.github_api_endpoint,
headers=headers,
debug=self.debug,
Expand Down
2 changes: 1 addition & 1 deletion master/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ dependencies = [

[dependency-groups]
dev = [
"ty~=0.0.16",
"ty~=0.0.65",
]
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ requires-python = ">=3.12"

[dependency-groups]
dev = [
"ruff~=0.15.0",
"ruff~=0.16.0",
"pre-commit~=4.2",
]

Expand Down
79 changes: 40 additions & 39 deletions uv.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions worker/buildbot.tac
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import os
import sys

from pathlib import Path

from buildbot_worker.bot import Worker
from twisted.application import service
from twisted.python.log import FileLogObserver, ILogObserver
from twisted.python.logfile import LogFile
from twisted.python.log import ILogObserver, FileLogObserver

basedir = os.path.abspath(os.path.dirname(__file__))
rotateLength = 10000000
Expand All @@ -28,7 +28,7 @@ application.setComponent(ILogObserver, FileLogObserver(logfile).emit)
# buildmaster_host = os.environ.get('HALIDE_BB_MASTER_ADDR', '142.254.82.210')

buildmaster_host = os.environ.get("HALIDE_BB_MASTER_ADDR", "buildbot.halide-lang.org")
port = os.environ.get("HALIDE_BB_MASTER_PORT", 9990)
port = int(os.environ.get("HALIDE_BB_MASTER_PORT", "9990"))
workername = os.environ.get("HALIDE_BB_WORKER_NAME")
passwd = Path("halide_bb_pass.txt").read_text().strip()
keepalive = 60 # default is 10 mins; we'll use 60 secs because flaky Windows networking
Expand Down
Loading