diff --git a/.github/workflows/validations.yml b/.github/workflows/validations.yml index fd6569a..82d6fa5 100644 --- a/.github/workflows/validations.yml +++ b/.github/workflows/validations.yml @@ -48,9 +48,7 @@ jobs: - uses: astral-sh/setup-uv@v6 - name: Type-check master config - run: | - uv sync - uv run --package master ty check --error-on-warning master/master.cfg master/custom_steps.py + run: uv run --package master ty check --error-on-warning master/master.cfg master/custom_steps.py bandit: runs-on: ubuntu-slim diff --git a/master/master.cfg b/master/master.cfg index 42c06ac..ab2738e 100644 --- a/master/master.cfg +++ b/master/master.cfg @@ -580,16 +580,16 @@ def add_vcpkg_step(factory, builder_type): ) if builder_type.os == "windows": - disable_metrics_cmd = Interpolate('type nul > "%(prop:builddir)s\\vcpkg\\vcpkg.disable-metrics"') + bootstrap_cmd = Interpolate('"%(prop:builddir)s\\vcpkg\\bootstrap-vcpkg.bat" -disableMetrics') else: - disable_metrics_cmd = Interpolate('touch "%(prop:builddir)s/vcpkg/vcpkg.disable-metrics"') + bootstrap_cmd = Interpolate('"%(prop:builddir)s/vcpkg/bootstrap-vcpkg.sh" -disableMetrics') factory.addStep( ShellCommand( - name="Disable vcpkg metrics", + name="Bootstrap vcpkg", locks=[performance_lock.access("counting")], - haltOnFailure=False, - command=disable_metrics_cmd, + haltOnFailure=True, + command=bootstrap_cmd, ) ) diff --git a/master/pyproject.toml b/master/pyproject.toml index 9caa7f8..eb6a417 100644 --- a/master/pyproject.toml +++ b/master/pyproject.toml @@ -10,3 +10,8 @@ dependencies = [ "twisted>=23.10", "zstandard>=0.22", # log chunk compression (c['logCompressionMethod']) ] + +[dependency-groups] +dev = [ + "ty~=0.0.16", +] diff --git a/pyproject.toml b/pyproject.toml index db00d3c..2ffe232 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,6 @@ requires-python = ">=3.12" [dependency-groups] dev = [ "ruff~=0.15.0", - "ty~=0.0.16", "pre-commit~=4.2", ] diff --git a/uv.lock b/uv.lock index bf088c7..1c9bd8f 100644 --- a/uv.lock +++ b/uv.lock @@ -448,7 +448,6 @@ source = { virtual = "." } dev = [ { name = "pre-commit" }, { name = "ruff" }, - { name = "ty" }, ] [package.metadata] @@ -457,7 +456,6 @@ dev = [ dev = [ { name = "pre-commit", specifier = "~=4.2" }, { name = "ruff", specifier = "~=0.15.0" }, - { name = "ty", specifier = "~=0.0.16" }, ] [[package]] @@ -602,6 +600,11 @@ dependencies = [ { name = "zstandard" }, ] +[package.dev-dependencies] +dev = [ + { name = "ty" }, +] + [package.metadata] requires-dist = [ { name = "buildbot", specifier = "~=4.0" }, @@ -612,6 +615,9 @@ requires-dist = [ { name = "zstandard", specifier = ">=0.22" }, ] +[package.metadata.requires-dev] +dev = [{ name = "ty", specifier = "~=0.0.16" }] + [[package]] name = "msgpack" version = "1.2.1"