build: Update QEMU base image to v7.29 (#377)

Add error handling for logo replacement in BIOS

.devcontainer/010 - macOS Sequoia/devcontainer.json

@@ -15,6 +15,5 @@
     "onAutoForward": "ignore"
   }, 
   "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/macos",
   "initializeCommand": "docker system prune --all --force"
 }

.devcontainer/030 - macOS Ventura/devcontainer.json

@@ -15,6 +15,5 @@
     "onAutoForward": "ignore"
   }, 
   "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/macos",
   "initializeCommand": "docker system prune --all --force"
 }

.devcontainer/040 - macOS Monterey/devcontainer.json

@@ -15,6 +15,5 @@
     "onAutoForward": "ignore"
   }, 
   "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/macos",
   "initializeCommand": "docker system prune --all --force"
 }

.devcontainer/050 - macOS Big Sur/devcontainer.json

@@ -15,6 +15,5 @@
     "onAutoForward": "ignore"
   }, 
   "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/macos",
   "initializeCommand": "docker system prune --all --force"
 }

.devcontainer/060 - macOS Catalina/devcontainer.json

@@ -15,6 +15,5 @@
     "onAutoForward": "ignore"
   }, 
   "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/macos",
   "initializeCommand": "docker system prune --all --force"
 }

.devcontainer/devcontainer.json

@@ -15,6 +15,5 @@
     "onAutoForward": "ignore"
   }, 
   "dockerComposeFile": "codespaces.yml",
-  "workspaceFolder": "/workspaces/macos",
   "initializeCommand": "docker system prune --all --force"
 }

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       -

.github/workflows/check.yml

@@ -7,7 +7,7 @@ jobs:
     name: shellcheck
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Run ShellCheck
         uses: ludeeus/action-shellcheck@master
         env:

.github/workflows/hub.yml

@@ -12,13 +12,15 @@ jobs:
   dockerHubDescription:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+      -
-    - 
+        name: Checkout repo
-      name: Docker Hub Description
+        uses: actions/checkout@v6
-      uses: peter-evans/dockerhub-description@v5
+      - 
-      with:
+        name: Docker Hub Description
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        uses: peter-evans/dockerhub-description@v5
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        with:
-        repository: ${{ secrets.DOCKERHUB_REPO }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
-        short-description: ${{ github.event.repository.description }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
-        readme-filepath: ./readme.md
+          repository: ${{ secrets.DOCKERHUB_REPO }}
+          short-description: ${{ github.event.repository.description }}
+          readme-filepath: ./readme.md

.github/workflows/review.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       -
         name: Spelling
         uses: reviewdog/action-misspell@v1

Dockerfile

@@ -12,7 +12,7 @@ RUN apk --update --no-cache add unzip && \
     rm -rf /tmp/* /var/tmp/* /var/cache/apk/*
 
 FROM scratch AS runner
-COPY --from=qemux/qemu:7.28 / /
+COPY --from=qemux/qemu:7.29 / /
 
 ARG VERSION_ARG="0.0"
 ARG VERSION_KVM_OPENCORE="v21"

src/boot.sh

@@ -48,7 +48,10 @@ if [ ! -s "$DEST.rom" ] || [ ! -f "$DEST.rom" ]; then
   if [[ "${LOGO:-}" == [Nn]* ]]; then
     cp "$OVMF/$ROM" "$DEST.tmp"
   else
-    /run/utk.bin "$OVMF/$ROM" replace_ffs LogoDXE "/var/www/img/${PROCESS,,}.ffs" save "$DEST.tmp"
+    if ! /run/utk.bin "$OVMF/$ROM" replace_ffs LogoDXE "/var/www/img/${PROCESS,,}.ffs" save "$DEST.tmp"; then
+      warn "failed to add custom logo to BIOS!"
+      cp "$OVMF/$ROM" "$DEST.tmp"
+    fi
   fi
   mv "$DEST.tmp" "$DEST.rom"
   ! setOwner "$DEST.rom" && error "Failed to set the owner for \"$DEST.rom\" !"