From 9077dacdadc8f5614a8accfe74c193b8ec7be5e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@freedom.press>
Date: Mon, 30 Sep 2024 18:55:52 +0200
Subject: [PATCH] FIXUP: Use bookworm as the reference debian version

---
 .github/workflows/ci.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 946b41e36..007e357a3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,20 +54,19 @@ jobs:
         run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
 
       - name: Restore container cache
+        id: restore-container-cache
         uses: actions/cache@v4
         with:
           key: v2-${{ steps.date.outputs.date }}-${{ hashFiles('Dockerfile', 'dangerzone/conversion/common.py', 'dangerzone/conversion/doc_to_pixels.py', 'dangerzone/conversion/pixels_to_pdf.py', 'poetry.lock', 'gvisor_wrapper/entrypoint.py') }}
           path: |-
             share/container.tar.gz
             share/image-id.txt
-      - name: Build Dangerzone image
-        run: |-
-          if [ -f "share/container.tar.gz" ]; then
-            echo "Already cached, skipping"
-          else
-            sudo apt-get install -y python3-poetry
-            python3 ./install/common/build-image.py
-          fi
+
+      - name: Build and push Dangerzone image
+        if: ${{ steps.restore-container-cache.outputs.cache-hit != 'true' }}
+        run: |
+          sudo apt-get install -y python3-poetry
+          python3 ./install/common/build-image.py
 
   windows:
     runs-on: windows-latest
@@ -163,7 +162,7 @@ jobs:
               run --dev --no-gui ./dangerzone/install/linux/build-deb.py
 
       - name: Upload Dangerzone .deb
-        if: matrix.distro == 'debian' && matrix.version == 'trixie'
+        if: matrix.distro == 'debian' && matrix.version == 'bookworm'
         uses: actions/upload-artifact@v4
         with:
           name: dangerzone.deb