From f65d257565ab0244b294974f8ec24b5432b41753 Mon Sep 17 00:00:00 2001 From: inffy <10782843+inffy@users.noreply.github.com> Date: Mon, 2 Nov 2026 14:56:28 +0000 Subject: [PATCH 1/4] feat(ci): add dnf-retry wrapper script (#3133) Co-authored-by: renner <80410025+renner0e@users.noreply.github.com> --- build_scripts/base/01-packages.sh | 2 +- build_scripts/shared/build-prep.sh | 1 + build_scripts/shared/utils/dnf-retry | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100755 build_scripts/shared/utils/dnf-retry diff --git a/build_scripts/base/01-packages.sh b/build_scripts/base/01-packages.sh index c9ec968f..d024f6f3 100755 --- a/build_scripts/base/01-packages.sh +++ b/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" diff --git a/build_scripts/shared/build-prep.sh b/build_scripts/shared/build-prep.sh index 0e00be92..bf752be0 100755 --- a/build_scripts/shared/build-prep.sh +++ b/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::" diff --git a/build_scripts/shared/utils/dnf-retry b/build_scripts/shared/utils/dnf-retry new file mode 100755 index 00000000..0100e837 --- /dev/null +++ b/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" + From e4ac5de71ff8ced1b832ec3b0124183d88478a79 Mon Sep 17 00:00:00 2001 From: "ubot-7274[bot]" <217212047+ubot-7274[bot]@users.noreply.github.com> Date: Tue, 3 Nov 2026 03:11:08 +0000 Subject: [PATCH 2/4] chore(deps): update quay.io/fedora-ostree-desktops/kinoite:45 docker digest to 1ea3d6c (#3138) Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com> --- image-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-versions.yml b/image-versions.yml index 20603aaf..b9fc7038 100644 --- a/image-versions.yml +++ b/image-versions.yml @@ -3,7 +3,7 @@ images: - name: kinoite image: quay.io/fedora-ostree-desktops/kinoite tag: 45 - digest: sha256:d54aee1a7232e0df3db47ccbd3b15df03c3dbe953df4f0c65b4a1297925f33ad + digest: sha256:1ea3d6cf390981ad487a9979ef9a78ff48dcb2289a688e611adcbcef5848502d # https://github.com/get-aurora-dev/common - name: common From f27c96fefdf376cff23995b54109826d49735ba4 Mon Sep 17 00:00:00 2001 From: "ubot-7274[bot]" <217212047+ubot-7274[bot]@users.noreply.github.com> Date: Tue, 3 Nov 2026 04:47:21 +0000 Subject: [PATCH 3/4] chore(deps): update zizmorcore/zizmor-action action to v0.8.1 (#3137) Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com> --- .github/workflows/zizmor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml index 324a4114..5bf3ca72 100644 --- a/.github/workflows/zizmor.yml +++ b/.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 From 2dd27d19304a913b8684e61df3b94cc0f7b82b0d Mon Sep 17 00:00:00 2001 From: "ubot-7274[bot]" <217212047+ubot-7274[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2026 03:09:22 +0000 Subject: [PATCH 4/4] chore(deps): update quay.io/fedora-ostree-desktops/kinoite:45 docker digest to 45c510b (#3141) Co-authored-by: ubot-7274[bot] <217212047+ubot-7274[bot]@users.noreply.github.com> --- image-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-versions.yml b/image-versions.yml index b9fc7038..21395c8e 100644 --- a/image-versions.yml +++ b/image-versions.yml @@ -3,7 +3,7 @@ images: - name: kinoite image: quay.io/fedora-ostree-desktops/kinoite tag: 45 - digest: sha256:1ea3d6cf390981ad487a9979ef9a78ff48dcb2289a688e611adcbcef5848502d + digest: sha256:45c510bf901b9f01fd7f5c4f48837156987c37ac968cc19b2d382ea13b318906 # https://github.com/get-aurora-dev/common - name: common