Merge upstream ublue-os/aurora main

.github/workflows/zizmor.yml

@@ -29,6 +29,6 @@ jobs:
           persist-credentials: false
 
       - name: Run zizmor
-        uses: zizmorcore/zizmor-action@53290badfa369cb0bf7ad16342cb62c2fa47ac7b # v0.8.0
+        uses: zizmorcore/zizmor-action@45d7276c9ca790aabd705e31ca99c6185c3e76dd # v0.8.1
         with:
           persona: auditor

build_scripts/base/01-packages.sh

@@ -153,7 +153,7 @@ TERRA_PACKAGES=(
 # Fedora Tailscale is usually behind
 TAILSCALE=(tailscale)
 
-dnf -y install --from-repo="terra" "${TERRA_PACKAGES[@]}"
+dnf-retry -y install --from-repo="terra" "${TERRA_PACKAGES[@]}"
 
 COPR_PREFIX="copr:copr.fedorainfracloud.org"
 

build_scripts/shared/build-prep.sh

@@ -27,5 +27,6 @@ dnf config-manager disable fedora-cisco-openh264
 
 mkdir -p /tmp/scripts/helpers
 install -Dm0755 /ctx/build_scripts/shared/utils/ghcurl /tmp/scripts/helpers/ghcurl
+install -Dm0755 /ctx/build_scripts/shared/utils/dnf-retry /tmp/scripts/helpers/dnf-retry
 
 echo "::endgroup::"

build_scripts/shared/utils/dnf-retry

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+tries=5
+sleep=60
+
+for i in $(seq 1 "${tries}"); do
+    if [[ ${i} -gt 1 ]]; then
+        # echo "[+] Command failed. Waiting for ${sleep} seconds"
+        sleep "${sleep}"
+    fi
+    # echo "[+] Running (try: ${i}): dnf ${*}"
+    dnf "${@}" && r=0 && break || r=$?
+done
+exit "$r"
+

image-versions.yml

@@ -3,7 +3,7 @@ images:
   - name: kinoite
     image: quay.io/fedora-ostree-desktops/kinoite
     tag: 45
-    digest: sha256:d54aee1a7232e0df3db47ccbd3b15df03c3dbe953df4f0c65b4a1297925f33ad
+    digest: sha256:45c510bf901b9f01fd7f5c4f48837156987c37ac968cc19b2d382ea13b318906
 
   # https://github.com/get-aurora-dev/common
   - name: common