Merge branch 'main' into dependabot/pip/python-03688326f5

trailofbits · Dec 2, 2024 · 2486fb8 · 2486fb8
2 parents 8c3130c + b2640fe
commit 2486fb8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -26,9 +26,8 @@ jobs:
           persist-credentials: false
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@d8db0a86d3d88f3017a4e6b8a1e2b234e7a0a1b5 # v4.0.0
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a # v4.2.0
         with:
-          version: "0.4.18"
           enable-cache: true
           cache-dependency-glob: pyproject.toml
 
@@ -135,9 +134,8 @@ jobs:
           name: rfc3161-sdist
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@d8db0a86d3d88f3017a4e6b8a1e2b234e7a0a1b5 # v4.0.0
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a # v4.2.0
         with:
-          version: "0.4.18"
           enable-cache: true
           cache-dependency-glob: pyproject.toml
 
@@ -154,7 +152,7 @@ jobs:
           toolchain: stable
           target: ${{ matrix.WINDOWS.RUST_TRIPLE }}
 
-      - uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11 # v6
+      - uses: dawidd6/action-download-artifact@80620a5d27ce0ae443b965134db88467fc607b43 # v7
         with:
           repo: pyca/infra
           workflow: build-windows-openssl.yml

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -25,9 +25,8 @@ jobs:
           toolchain: 1.81.0
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@d8db0a86d3d88f3017a4e6b8a1e2b234e7a0a1b5 # v4.0.0
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a # v4.2.0
         with:
-          version: "0.4.18"
           enable-cache: true
           cache-dependency-glob: pyproject.toml
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -26,15 +26,12 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@d8db0a86d3d88f3017a4e6b8a1e2b234e7a0a1b5 # v4.0.0
+      - name: Install the latest version of uv and set the python version
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a # v4.2.0
         with:
-          version: "0.4.18"
           enable-cache: true
           cache-dependency-glob: pyproject.toml
-
-      - name: Install Python ${{ matrix.python }}
-        run: uv python install ${{ matrix.python }}
+          python-version: ${{ matrix.python }}
 
       - name: test
         run: make test INSTALL_EXTRA=test
@@ -57,17 +54,14 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@d8db0a86d3d88f3017a4e6b8a1e2b234e7a0a1b5 # v4.0.0
+      - name: Install the latest version of uv and set the python version
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a # v4.2.0
         with:
-          version: "0.4.18"
           enable-cache: true
           cache-dependency-glob: pyproject.toml
+          python-version: ${{ matrix.python }}
 
-      - name: Install Python ${{ matrix.python }}
-        run: uv python install ${{ matrix.python }}
-
-      - uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11 # v6
+      - uses: dawidd6/action-download-artifact@80620a5d27ce0ae443b965134db88467fc607b43 # v7
         with:
           repo: pyca/infra
           workflow: build-windows-openssl.yml