Bump astral-sh/setup-uv from 4 to 5 in the actions group (#95)

Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Alexis <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alexis <[email protected]>
trailofbits · Dec 26, 2024 · 2c9ce3b · 2c9ce3b
1 parent 68a5770
commit 2c9ce3b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -26,7 +26,7 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a # v4.2.0
+        uses: astral-sh/setup-uv@887a942a15af3a7626099df99e897a18d9e5ab3a # v5.1.0
         with:
           enable-cache: true
           cache-dependency-glob: pyproject.toml
@@ -134,7 +134,7 @@ jobs:
           name: rfc3161-sdist
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a # v4.2.0
+        uses: astral-sh/setup-uv@887a942a15af3a7626099df99e897a18d9e5ab3a # v5.1.0
         with:
           enable-cache: true
           cache-dependency-glob: pyproject.toml

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -25,7 +25,7 @@ jobs:
           toolchain: 1.81.0
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a # v4.2.0
+        uses: astral-sh/setup-uv@887a942a15af3a7626099df99e897a18d9e5ab3a # v5.1.0
         with:
           enable-cache: true
           cache-dependency-glob: pyproject.toml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -28,11 +28,13 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv and set the python version
-        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a # v4.2.0
+        uses: astral-sh/setup-uv@887a942a15af3a7626099df99e897a18d9e5ab3a # v5.1.0
         with:
           enable-cache: true
           cache-dependency-glob: pyproject.toml
-          python-version: ${{ matrix.python }}
+
+      - name: Install python
+        run: uv python install ${{ matrix.python }}
 
       - name: test
         run: make test INSTALL_EXTRA=test
@@ -56,11 +58,17 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv and set the python version
-        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a # v4.2.0
+        uses: astral-sh/setup-uv@887a942a15af3a7626099df99e897a18d9e5ab3a # v5.1.0
         with:
           enable-cache: true
           cache-dependency-glob: pyproject.toml
-          python-version: ${{ matrix.python }}
+
+      # Split Python installation from virtual environment creation.
+      # setup-uv@v5's python-version parameter automatically creates and activates a venv, which conflicts with our
+      # Makefile's venv management.
+      # https://github.com/astral-sh/setup-uv/pull/194
+      - name: Install python
+        run: uv python install ${{ matrix.python }}
 
       - uses: dawidd6/action-download-artifact@80620a5d27ce0ae443b965134db88467fc607b43 # v7
         with:
@@ -80,6 +88,9 @@ jobs:
 
       - name: test
         run: |
+          # We need to do this in CI because setup-uv@v5 automatically creates a new venv and it prevents us from 
+          # installing our dependencies in the Makefile.
+          touch pyproject.toml
           make test INSTALL_EXTRA=test
         shell: bash
 

diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
@@ -22,7 +22,7 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v5
 
       - name: Run zizmor 🌈
         run: uvx zizmor --format sarif . > results.sarif