fix: docker build

Author: scorix

.github/workflows/docker-build.yml

@@ -16,13 +16,15 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
       - name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
@@ -32,7 +34,18 @@ jobs:
           cache-to: type=gha,mode=max,scope=buildkit-python-mapnik
           load: true
 
+      - name: Cache uv virtual environment (for container tests)
+        uses: actions/cache@v5
+        with:
+          path: .venv
+          key: venv-docker-${{ runner.os }}-${{ hashFiles('uv.lock', 'pyproject.toml', 'setup.py') }}
+          restore-keys: |
+            venv-docker-${{ runner.os }}-
+
       - name: Run tests in Docker container
         run: |
-          docker run --rm -v ${{ github.workspace }}/test:/test python-mapnik:latest \
-            sh -c "uv pip install pytest pytest-cov && uv run pytest /test/python_tests -v"
+          docker run --rm \
+            -v ${{ github.workspace }}:/workspace \
+            -w /workspace/test/python_tests \
+            python-mapnik:latest \
+            sh -c "uv sync --extra test && uv run pytest . -v"

.github/workflows/release.yml

@@ -29,9 +29,11 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
 
-      - name: Cache uv downloads/builds
+      - name: Cache uv downloads
         uses: actions/cache@v5
         with:
           path: /github/home/.cache/uv
@@ -80,7 +82,7 @@ jobs:
           retention-days: 7
 
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: github.event_name == 'push'
         with:
           tag_name: ${{ steps.version.outputs.version }}

.github/workflows/test.yml

@@ -23,18 +23,27 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: recursive
 
-      - name: Cache uv downloads/builds
+      - name: Cache uv downloads
         uses: actions/cache@v5
         with:
           path: /github/home/.cache/uv
           key: uvcache-${{ runner.os }}-${{ hashFiles('uv.lock', 'pyproject.toml') }}
           restore-keys: |
             uvcache-${{ runner.os }}-
 
+      - name: Cache uv virtual environment and build artifacts
+        uses: actions/cache@v5
+        with:
+          path: .venv
+          key: venv-${{ runner.os }}-${{ hashFiles('uv.lock', 'pyproject.toml', 'setup.py') }}-${{ hashFiles('src/**/*.cpp', 'src/**/*.hpp', 'packaging/**/*.py') }}
+          restore-keys: |
+            venv-${{ runner.os }}-${{ hashFiles('uv.lock', 'pyproject.toml', 'setup.py') }}-
+            venv-${{ runner.os }}-
+
       - name: Add Debian sid repository
         run: |
           echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list.d/sid.list
@@ -93,7 +102,7 @@ jobs:
           comment_mode: off
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         if: always()
         with:
           files: ./coverage.xml