diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index c502380..e14cbf3 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -26,6 +26,8 @@ jobs: permissions: contents: write pull-requests: write + env: + UV_PYTHON: ${{ matrix.python-version }} strategy: fail-fast: false @@ -40,11 +42,6 @@ jobs: - name: Install mise uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3 - with: - # Workaround: Use `--env ci` to load mise.ci.toml which contains constant tools (uv). - # This allows us to override only the Python version via install-args without duplicating - # tool definitions. - install-args: "python@${{ matrix.python-version }} --env ci" - name: Run unit tests run: mise run ci:test:unit diff --git a/mise.ci.toml b/mise.ci.toml deleted file mode 100644 index f8be079..0000000 --- a/mise.ci.toml +++ /dev/null @@ -1,3 +0,0 @@ -[tools] -# only include constant tools here, dynamic versions are handled by the CI workflow -uv = "0.9.21" \ No newline at end of file diff --git a/mise.toml b/mise.toml index e9082b5..6cd7aa6 100644 --- a/mise.toml +++ b/mise.toml @@ -1,5 +1,6 @@ [tools] -python = "3.14.2" +# reuse UV_PYTHON from the CI environment to avoid installing two versions of Python (performance) +python = "{{ get_env(name='UV_PYTHON', default='3.14.2') }}" uv = "0.9.21" # https://mise.jdx.dev/mise-cookbook/python.html#mise-uv diff --git a/renovate.json b/renovate.json index d860981..feb6a64 100644 --- a/renovate.json +++ b/renovate.json @@ -13,8 +13,7 @@ "matchPackageNames": [ "uv", "uv_build", - "astral-sh/uv", - "astral-sh/setup-uv" + "astral-sh/uv" ] } ]