Skip to content

Commit

Permalink
Allow building trixie images
Browse files Browse the repository at this point in the history
  • Loading branch information
Salamandar committed Nov 5, 2024
1 parent b29dfbe commit 4fd3e05
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion image_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,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"]
)
Expand Down
4 changes: 2 additions & 2 deletions recipes
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,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 "$INSTALL_SCRIPT" -o install.sh

# Disable the install of yunohost itself, because we need this for the core CI
Expand Down Expand Up @@ -117,7 +117,7 @@ function dev()
install_gitlab_runner_light

# Download and run the YunoHost install script
curl "https://raw.githubusercontent.com/YunoHost/install_script/main/$DEBIAN_VERSION" -o install.sh
curl "https://raw.githubusercontent.com/YunoHost/install_script/trixie/$DEBIAN_VERSION" -o install.sh
chmod +x install.sh
./install.sh -a -d "$RELEASE"
rm install.sh
Expand Down
3 changes: 3 additions & 0 deletions update_all_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,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...
Expand Down

0 comments on commit 4fd3e05

Please sign in to comment.