From 7c1372862d003a8b37e9cbe8df1626c63409aea5 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 24 Jul 2025 18:05:04 -0500 Subject: [PATCH 1/9] bump astral-sh/setup-uv to v6.4.3 --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 4 ++-- .github/workflows/zizmor.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fd39c7b9..d9ce5a30 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -27,7 +27,7 @@ jobs: persist-credentials: false - name: Install uv - uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0 + uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc with: enable-cache: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3a3fbd75..965308b5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,7 +41,7 @@ jobs: persist-credentials: false - name: Install uv - uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0 + uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc with: enable-cache: true @@ -66,7 +66,7 @@ jobs: persist-credentials: false - name: Install uv - uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0 + uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc with: enable-cache: true diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml index ff632d4a..7d9b6cf9 100644 --- a/.github/workflows/zizmor.yml +++ b/.github/workflows/zizmor.yml @@ -20,7 +20,7 @@ jobs: persist-credentials: false - name: Install uv - uses: astral-sh/setup-uv@445689ea25e0de0a23313031f5fe577c74ae45a1 # v6.3.0 + uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc with: enable-cache: true From 906849314943be702af2ada1b84e1cc4d4fddcda Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 24 Jul 2025 18:11:37 -0500 Subject: [PATCH 2/9] use noxfile session for linting --- .github/workflows/lint.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d9ce5a30..70a33f9c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -36,13 +36,10 @@ jobs: path: ~/.cache/pre-commit/ key: pre-commit-1|${{ hashFiles('.pre-commit-config.yaml') }} - - name: pre-commit + - name: Run pre-commit run: | SKIP=no-commit-to-branch \ - uv run --with pre-commit-uv pre-commit run \ - --all-files \ - --show-diff-on-failure \ - --color always + uv run noxfile.py --session lint rustfmt: runs-on: ubuntu-24.04 From b72e518e8e7897d381facadb2ee1f67914eb7893 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 24 Jul 2025 18:15:24 -0500 Subject: [PATCH 3/9] add debug list of dir --- .github/workflows/lint.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 70a33f9c..23f4c19e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -36,6 +36,9 @@ jobs: path: ~/.cache/pre-commit/ key: pre-commit-1|${{ hashFiles('.pre-commit-config.yaml') }} + - run: | + ls -la /home/runner/.local/bin/ + - name: Run pre-commit run: | SKIP=no-commit-to-branch \ From 9c16c8811c0360ffb44006fd4c699e253654c8c3 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 24 Jul 2025 18:18:14 -0500 Subject: [PATCH 4/9] remove cache for now --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 23f4c19e..6e56e077 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -29,7 +29,7 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc with: - enable-cache: true + enable-cache: false - uses: actions/cache@v4 with: From 47e95185d8c825e9fee5544d248bf53b7321ab80 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 24 Jul 2025 18:21:43 -0500 Subject: [PATCH 5/9] more debugging --- .github/workflows/lint.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6e56e077..a86d5391 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -29,6 +29,7 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc with: + activate-environment: true enable-cache: false - uses: actions/cache@v4 @@ -37,7 +38,7 @@ jobs: key: pre-commit-1|${{ hashFiles('.pre-commit-config.yaml') }} - run: | - ls -la /home/runner/.local/bin/ + which uv - name: Run pre-commit run: | From c89500122efd27e1f39fce24387fe61e0c52c835 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 24 Jul 2025 18:30:35 -0500 Subject: [PATCH 6/9] let's try this! --- .github/workflows/lint.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a86d5391..a55a2524 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -39,6 +39,8 @@ jobs: - run: | which uv + mkdir -p ~/.local/bin + ln -sf $(which uv) ~/.local/bin/uv - name: Run pre-commit run: | From e8e03d44f3a7c9b2ccff8cac4933979e10eedebe Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 24 Jul 2025 18:37:01 -0500 Subject: [PATCH 7/9] add cmd line options --- noxfile.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/noxfile.py b/noxfile.py index 50452e62..3dc209e6 100644 --- a/noxfile.py +++ b/noxfile.py @@ -122,6 +122,9 @@ def lint(session): "pre-commit", "run", "--all-files", + "--show-diff-on-failure", + "--color", + "always", ) From 285620eac114057a29ebf460170169544215297c Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 24 Jul 2025 18:37:13 -0500 Subject: [PATCH 8/9] reenable cache and add hack comment --- .github/workflows/lint.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a55a2524..1acf1e89 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -30,18 +30,20 @@ jobs: uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc with: activate-environment: true - enable-cache: false + enable-cache: true + + # HACK: there's a bug in either `astral-sh/setup-uv` or pre-commit-uv or both + # because uv gets installed to `/opt/hostedtoolcache/uv//x86_64/uv` + # and pre-commit-uv apparently only looks for it at `~/.local/bin/uv` + - run: | + mkdir -p ~/.local/bin + ln -sf $(which uv) ~/.local/bin/uv - uses: actions/cache@v4 with: path: ~/.cache/pre-commit/ key: pre-commit-1|${{ hashFiles('.pre-commit-config.yaml') }} - - run: | - which uv - mkdir -p ~/.local/bin - ln -sf $(which uv) ~/.local/bin/uv - - name: Run pre-commit run: | SKIP=no-commit-to-branch \ From 45d1a09a3a1c91a4a1a64a6470c437ed9f7cd9b5 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 24 Jul 2025 18:37:29 -0500 Subject: [PATCH 9/9] activate env --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 965308b5..30b882ff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,6 +43,7 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc with: + activate-environment: true enable-cache: true - id: set-matrix @@ -68,6 +69,7 @@ jobs: - name: Install uv uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc with: + activate-environment: true enable-cache: true - name: Run tests