From e867758f0c3ca5475dd9b03d3212d9fd2f279f44 Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Thu, 20 Feb 2025 12:32:32 -0500 Subject: [PATCH 1/4] ci: only pass 'UV_VERSION' to Dockerfiles that actually use it Otherwise it can cause some annoyance / confusion when building images locally. --- taskcluster/kinds/docker-image/kind.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/taskcluster/kinds/docker-image/kind.yml b/taskcluster/kinds/docker-image/kind.yml index 47cb1bf73..361c73b67 100644 --- a/taskcluster/kinds/docker-image/kind.yml +++ b/taskcluster/kinds/docker-image/kind.yml @@ -2,6 +2,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. --- +meta: + - &uv_version 0.4.9 loader: taskgraph.loader.transform:loader @@ -10,10 +12,6 @@ transforms: - taskgraph.transforms.cached_tasks:transforms - taskgraph.transforms.task:transforms -task-defaults: - args: - UV_VERSION: 0.4.9 - # make a task for each docker-image we might want. For the moment, since we # write artifacts for each, these are whitelisted, but ideally that will change # (to use subdirectory clones of the proper directory), at which point we can @@ -31,7 +29,10 @@ tasks: symbol: I(py) args: PYTHON_VERSIONS: "3.13 3.12 3.11 3.10 3.9 3.8" + UV_VERSION: *uv_version run-task: symbol: I(rt) + args: + UV_VERSION: *uv_version skopeo: symbol: I(skopeo) From fd54cb21fe2e8e22a249945dacc9b3c7af82f0c1 Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Thu, 20 Feb 2025 12:35:11 -0500 Subject: [PATCH 2/4] fix(decision): remove misconfigured environment variable from Decision image This variable wasn't being used properly. Older versions of uv were failing silently, but as of uv 0.4.13 this started causing an error. --- taskcluster/docker/decision/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/taskcluster/docker/decision/Dockerfile b/taskcluster/docker/decision/Dockerfile index 7d86d7080..f2b69549f 100644 --- a/taskcluster/docker/decision/Dockerfile +++ b/taskcluster/docker/decision/Dockerfile @@ -1,8 +1,6 @@ FROM $DOCKER_IMAGE_PARENT LABEL maintainer="Release Engineering " -ENV UV_PROJECT_ENVIRONMENT=/setup/taskgraph - # %include src # %include packages # %include .hatch_build.py From 1e2f1021cc52f687dd507440a9ad648007d7fdda Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Wed, 19 Feb 2025 12:54:43 -0500 Subject: [PATCH 3/4] fix(decision): update uv to latest version in run-task/decision images --- taskcluster/kinds/docker-image/kind.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taskcluster/kinds/docker-image/kind.yml b/taskcluster/kinds/docker-image/kind.yml index 361c73b67..06914ebf2 100644 --- a/taskcluster/kinds/docker-image/kind.yml +++ b/taskcluster/kinds/docker-image/kind.yml @@ -3,7 +3,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. --- meta: - - &uv_version 0.4.9 + - &uv_version 0.6.1 loader: taskgraph.loader.transform:loader From 6dbcacc8acec7e2325289eb6ef52dc821bfb8de3 Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Tue, 18 Feb 2025 14:53:23 -0500 Subject: [PATCH 4/4] ci: add pre-commit check to keep uv.lock updated --- .pre-commit-config.yaml | 6 +++++- uv.lock | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 979414bd8..063df4ff6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,11 +15,15 @@ repos: exclude: template - id: check-added-large-files - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.9.4 + rev: v0.9.6 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] - id: ruff-format + - repo: https://github.com/astral-sh/uv-pre-commit + rev: 0.6.1 + hooks: + - id: uv-lock - repo: https://github.com/adrienverge/yamllint.git rev: v1.35.1 hooks: diff --git a/uv.lock b/uv.lock index bd6de390c..440e443a1 100644 --- a/uv.lock +++ b/uv.lock @@ -1,4 +1,5 @@ version = 1 +revision = 1 requires-python = ">=3.8" [[package]] @@ -1071,7 +1072,6 @@ wheels = [ [[package]] name = "taskcluster-taskgraph" -version = "13.1.0" source = { editable = "." } dependencies = [ { name = "appdirs" }, @@ -1123,6 +1123,7 @@ requires-dist = [ { name = "voluptuous", specifier = ">=0.12.1" }, { name = "zstandard", marker = "extra == 'load-image'" }, ] +provides-extras = ["load-image"] [package.metadata.requires-dev] dev = [