Allow building trixie images

YunoHost · Nov 13, 2024 · daee8b0 · daee8b0
1 parent 5b76505
commit daee8b0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/image_builder.py b/image_builder.py
@@ -124,7 +124,7 @@ def main():
         help="If passed, logs will be printed to this file",
     )
 
-    parser.add_argument("debian_version", type=str, choices=["bullseye", "bookworm"])
+    parser.add_argument("debian_version", type=str, choices=["bullseye", "bookworm", "trixie"])
     parser.add_argument(
         "distribution", type=str, choices=["stable", "testing", "unstable"]
     )

diff --git a/recipes b/recipes
@@ -67,7 +67,7 @@ function before_install()
     fi
 
     # Download the YunoHost install script
-    INSTALL_SCRIPT="https://raw.githubusercontent.com/YunoHost/install_script/main/$DEBIAN_VERSION"
+    INSTALL_SCRIPT="https://raw.githubusercontent.com/YunoHost/install_script/trixie/$DEBIAN_VERSION"
     curl -L -s "$INSTALL_SCRIPT" -o install.sh
 
     # Disable the install of yunohost itself, because we need this for the core CI
@@ -118,7 +118,7 @@ function dev()
     install_gitlab_runner_light
 
     # Download and run the YunoHost install script
-    INSTALL_SCRIPT="https://raw.githubusercontent.com/YunoHost/install_script/main/$DEBIAN_VERSION"
+    INSTALL_SCRIPT="https://raw.githubusercontent.com/YunoHost/install_script/trixie/$DEBIAN_VERSION"
     curl -L -s "$INSTALL_SCRIPT" -o install.sh
     chmod +x install.sh
     ./install.sh -a -d "$RELEASE"

diff --git a/update_all_images.sh b/update_all_images.sh
@@ -27,6 +27,9 @@ for variant in build-and-lint before-install all; do
     update_image bookworm stable "$variant"
     update_image bookworm unstable "$variant"
     update_image bookworm testing "$variant"
+
+    # Trixie only supports unstable, testing
+    update_image trixie unstable "$variant"
 done
 
 # Then remove old images. It might disturb downloads in progress though...