From 4e57829f4696a952985a7a0e4279fd4e3fb21565 Mon Sep 17 00:00:00 2001
From: Jan Brasna <1784648+janbrasna@users.noreply.github.com>
Date: Wed, 1 Oct 2025 13:49:02 +0200
Subject: [PATCH 1/2] Use docker compose bake backend for build-and-push CI

---
 .github/workflows/build-and-push.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 7dba7e4369d..f040c9dec44 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -42,7 +42,7 @@ jobs:
         with:
           buildkitd-flags: "cache-from: type=gha cache-to: type=gha,mode=max"
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
             fetch-depth: 10 # get enough so we have a Git history, but not everything
             fetch-tags: true
@@ -89,8 +89,6 @@ jobs:
 
       - name: Build and push public images to Docker Hub
         run: |
-            # FIXME: GitHub provides compose version enabling bake but timing out
-            export COMPOSE_BAKE=false
             ./bin/build-release-image.sh --push
         timeout-minutes: 90
         env:
@@ -149,8 +147,6 @@ jobs:
       id-token: write
 
     steps:
-      - uses: docker/setup-buildx-action@v3
-
       - id: gcp_auth
         uses: google-github-actions/auth@v2
         with:

From 37f3ec0cdfc84b942f34fe7714d77ecdd1c7bc2c Mon Sep 17 00:00:00 2001
From: Jan Brasna <1784648+janbrasna@users.noreply.github.com>
Date: Wed, 1 Oct 2025 13:59:11 +0200
Subject: [PATCH 2/2] Use bake for pull_request_tests builds

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

diff --git a/.github/workflows/pull_request_tests.yml b/.github/workflows/pull_request_tests.yml
index 59cdb014278..35178e07dfe 100644
--- a/.github/workflows/pull_request_tests.yml
+++ b/.github/workflows/pull_request_tests.yml
@@ -17,7 +17,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install chromium-browser xvfb
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:
           node-version: 20
@@ -29,19 +29,14 @@ jobs:
   test-python:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"  # matches current Python in production
+      - uses: actions/checkout@v5
       - name: "Run Python tests (on Docker)"
         run: |
-            # FIXME: GitHub provides compose version enabling bake but timing out
-            export COMPOSE_BAKE=false
             make clean test-image
             CONTAINER_ID=$(docker ps -alq)
             docker cp $CONTAINER_ID:/app/python_coverage .
-        timeout-minutes: 30
-      - name: Store coverage as an artifact
+        timeout-minutes: 60
+      - name: "Store coverage as an artifact"
         uses: actions/upload-artifact@v4
         with:
           name: coverage-results