From 3d094db59170ffc963a1add1b6902748d9f7fa60 Mon Sep 17 00:00:00 2001
From: Keerthi Gowda <kbalehal@qti.qualcomm.com>
Date: Thu, 23 Jul 2026 10:27:29 -0700
Subject: [PATCH] docker_deb_build: skip automatic rebuild and CI use for sid

Add 'sid' to SKIP_REBUILD_DISTROS alongside 'questing' to disable
automatic Docker image rebuilds for sid, since its Docker image
build is currently broken due to an unresolvable apt dependency
conflict between git-buildpackage's devscripts requirement
(libyaml-libyaml-perl -> perlapi-5.40.1) and git's newer perl-base
(5.42.2) in Debian sid.

Also drop 'sid' from the CI 'Validate Debian Images' loop and the
corresponding 'docker push ...:sid' step, matching how 'questing'
was previously excluded, so the workflow no longer attempts to
build or push a sid image.

Signed-off-by: Keerthi Gowda <kbalehal@qti.qualcomm.com>
---
 .github/workflows/container-build-and-upload.yml | 3 +--
 docker_deb_build.py                              | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/container-build-and-upload.yml b/.github/workflows/container-build-and-upload.yml
index 4b4cae2..df53a66 100644
--- a/.github/workflows/container-build-and-upload.yml
+++ b/.github/workflows/container-build-and-upload.yml
@@ -49,7 +49,7 @@ jobs:
           source_dir="${GITHUB_WORKSPACE}/.github/dummy-package"
           output_root="${GITHUB_WORKSPACE}/build/dummy-package"
 
-          for distro in noble resolute trixie sid; do
+          for distro in noble resolute trixie; do
             output_dir="${output_root}/${distro}"
             mkdir -p "${output_dir}"
             echo "Testing image '${distro}' with docker_deb_build.py"
@@ -78,7 +78,6 @@ jobs:
 
           # DEBIAN IMAGES
           docker push ghcr.io/${{env.QCOM_ORG_NAME}}/${{env.IMAGE_NAME}}:trixie
-          docker push ghcr.io/${{env.QCOM_ORG_NAME}}/${{env.IMAGE_NAME}}:sid
 
   build-rpm-arm64:
     runs-on: ubuntu-24.04-arm
diff --git a/docker_deb_build.py b/docker_deb_build.py
index 586bad7..96e7aec 100755
--- a/docker_deb_build.py
+++ b/docker_deb_build.py
@@ -31,7 +31,7 @@
 DOCKER_IMAGE_NAME_FMT = "ghcr.io/qualcomm-linux/pkg-builder:{suite_name}"
 
 # Distros excluded from automatic rebuild (e.g. temporarily broken upstream)
-SKIP_REBUILD_DISTROS = {"questing"}
+SKIP_REBUILD_DISTROS = {"questing", "sid"}
 
 def _discover_available_distros() -> list:
     """