From a1c71b186db081d3a9376bde9b1b86c6662c2eb3 Mon Sep 17 00:00:00 2001
From: Andreas Motl <andreas.motl@crate.io>
Date: Fri, 14 Feb 2025 00:03:52 +0100
Subject: [PATCH 1/2] CI: Fix and improve pip/uv installation

---
 .github/workflows/tests.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0f08497..a39cdd4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -32,6 +32,7 @@ jobs:
     env:
       OS: ${{ matrix.os }}
       PYTHON: ${{ matrix.python-version }}
+      UV_SYSTEM_PYTHON: true
 
     services:
       cratedb:
@@ -44,21 +45,23 @@ jobs:
       - name: Acquire sources
         uses: actions/checkout@v4
 
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
-
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          architecture: x64
-          cache: 'pip'
-          cache-dependency-path: |
+
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          cache-dependency-glob: |
             pyproject.toml
             requirements*.txt
+          cache-suffix: ${{ matrix.python-version }}
+          enable-cache: true
+          version: "latest"
 
       - name: Set up project requirements and tools
-        run: uv pip install --system --requirement=requirements.txt --requirement=requirements-dev.txt
+        run: uv pip install --requirement=requirements.txt --requirement=requirements-dev.txt
 
       - name: Run linters and software tests
         run: poe check-cpython
@@ -94,6 +97,7 @@ jobs:
     env:
       OS: ${{ matrix.os }}
       MICROPYTHON: ${{ matrix.micropython-version }}
+      UV_SYSTEM_PYTHON: true
 
     services:
       cratedb:
@@ -113,7 +117,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@v5
       - name: Set up project tools
-        run: uv pip install --system poethepoet
+        run: uv pip install poethepoet
 
       # https://github.com/marketplace/actions/install-micropython
       - name: Set up MicroPython ${{ matrix.micropython-version }}

From 9ab7cad876e71a54533534bbddb87e1b9d7b04c4 Mon Sep 17 00:00:00 2001
From: Andreas Motl <andreas.motl@crate.io>
Date: Fri, 14 Feb 2025 00:18:28 +0100
Subject: [PATCH 2/2] MicroPython: Update to v1.22.2 and v1.24.1

v1.20.0 started having problems on vanilla CI/GHA.

micropython: error while loading shared libraries: libffi.so.7:
cannot open shared object file: No such file or directory
---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a39cdd4..8c62c02 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -89,8 +89,8 @@ jobs:
       matrix:
         os: ['ubuntu-latest']
         micropython-version: [
-          'v1.20.0',
-          'v1.24.0',
+          'v1.22.2',
+          'v1.24.1',
           'v1.25.0-preview',
         ]