Merge branch 'dev' into 'master' (542a92a5) · Commits · Clickable / Clickable

clickable/config/constants.py

+17

Changes for clickable/config/constants.py: 17 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -53,6 +53,8 @@ class Constants():
		os.path.join(docker_registry, 'clickable/arm64-ut24.04-1.x-arm64'),
		('24.04-2.x', 'arm64'):
		os.path.join(docker_registry, 'clickable/arm64-ut24.04-2.x-arm64'),
		('26.04-1.x', 'arm64'):
		os.path.join(docker_registry, 'clickable/arm64-ut26.04-1.x-arm64'),
		('next', 'arm64'):
		os.path.join(docker_registry, 'clickable/arm64-utnext-arm64'),
		},
		@@ -105,6 +107,14 @@ class Constants():
		os.path.join(docker_registry, 'clickable/amd64-ut24.04-2.x-amd64-ide'),
		('24.04-2.x', 'amd64-nvidia-ide'):
		os.path.join(docker_registry, 'clickable/amd64-ut24.04-2.x-amd64-nvidia-ide'),
		('26.04-1.x', 'amd64'):
		os.path.join(docker_registry, 'clickable/amd64-ut26.04-1.x-amd64'),
		('26.04-1.x', 'armhf'):
		os.path.join(docker_registry, 'clickable/amd64-ut26.04-1.x-armhf'),
		('26.04-1.x', 'arm64'):
		os.path.join(docker_registry, 'clickable/amd64-ut26.04-1.x-arm64'),
		('26.04-1.x', 'amd64-ide'):
		os.path.join(docker_registry, 'clickable/amd64-ut26.04-1.x-amd64-ide'),
		# (amd64-utnext-[ARCH]).
		('next', 'amd64'):
		os.path.join(docker_registry, 'clickable/amd64-utnext-amd64'),
		@@ -134,6 +144,9 @@ class Constants():
		('24.04-2.x', 'amd64'): os.path.join(docker_registry, 'clickable/ci-ut24.04-2.x-amd64'),
		('24.04-2.x', 'armhf'): os.path.join(docker_registry, 'clickable/ci-ut24.04-2.x-armhf'),
		('24.04-2.x', 'arm64'): os.path.join(docker_registry, 'clickable/ci-ut24.04-2.x-arm64'),
		('26.04-1.x', 'amd64'): os.path.join(docker_registry, 'clickable/ci-ut26.04-1.x-amd64'),
		('26.04-1.x', 'armhf'): os.path.join(docker_registry, 'clickable/ci-ut26.04-1.x-armhf'),
		('26.04-1.x', 'arm64'): os.path.join(docker_registry, 'clickable/ci-ut26.04-1.x-arm64'),
		('next', 'amd64'): os.path.join(docker_registry, 'clickable/ci-utnext-amd64'),
		('next', 'armhf'): os.path.join(docker_registry, 'clickable/ci-utnext-armhf'),
		('next', 'arm64'): os.path.join(docker_registry, 'clickable/ci-utnext-arm64'),
		@@ -145,6 +158,7 @@ class Constants():
		"ubuntu-sdk-20.04.1": "20.04",
		"ubuntu-touch-24.04-1.x": "24.04-1.x",
		"ubuntu-touch-24.04-2.x": "24.04-2.x",
		"ubuntu-touch-26.04-1.x": "26.04-1.x",
		"ubuntu-touch-next-internal": "next",
		}
		framework_image_fallback = {
		@@ -152,6 +166,7 @@ class Constants():
		'20.04': '20.04',
		'24.04-1.x': '24.04-1.x',
		'24.04-2.x': '24.04-2.x',
		'26.04-1.x': '26.04-1.x',
		'next': 'next',
		}

		@@ -160,6 +175,7 @@ class Constants():
		'20.04': '20.04',
		'24.04-1.x': '2404.1',
		'24.04-2.x': '2404.2',
		'26.04-1.x': '2604.1',
		'next': '9999',
		}

		@@ -175,6 +191,7 @@ class Constants():
		'20.04',
		'24.04-1.x',
		'24.04-2.x',
		'26.04-1.x',
		'next',
		]
		framework_base_default = '20.04'

clickable/config/project.py

+14 −7

Changes for clickable/config/project.py: 14 added lines, 7 removed lines.
Original line number	Diff line number	Diff line
		@@ -407,21 +407,28 @@ class ProjectConfig(BaseConfig):
		if self.needs_clickable_image():
		self.check_nvidia_mode()

		container_spec = self.build_arch
		nvidia_suffix = "-nvidia" if self.use_nvidia else ""
		ide_suffix = "-ide" if self.is_ide_command() else ""

		if self.use_nvidia:
		container_spec += "-nvidia"
		container_specs = [f"{self.build_arch}{nvidia_suffix}{ide_suffix}"]

		if self.is_ide_command():
		container_spec += "-ide"
		if self.use_nvidia:
		# Newer UT versions no longer have Nvidia images available.
		container_specs.append(f"{self.build_arch}{ide_suffix}")

		image_framework = self.get_image_framework()
		container_mapping_host = Constants.container_mapping[Constants.host_arch]
		container = container_mapping_host.get((image_framework, container_spec), None)

		container = None
		for spec in container_specs:
		container = container_mapping_host.get((image_framework, spec), None)
		if container:
		break

		if not container:
		framework_images = [f"{image_framework}-{spec}" for spec in container_specs]
		raise ClickableException(
		f'There is currently no docker image for {image_framework}-{container_spec}'
		f'There is currently no docker image for {",".join(framework_images)}'
		)

		self.config['docker_image'] = container

clickable/version.py

+1 −1

Changes for clickable/version.py: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ from clickable.config.constants import Constants
		from clickable.logger import logger


		__version__ = '8.9.0'
		__version__ = '8.10.0'

		__container_minimum_required__ = 13

debian/changelog

Changes for debian/changelog: 6 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		clickable (8.10.0) unstable; urgency=medium

		* Added support for ubuntu-touch-26.04-1.x framework

		-- Clickable <bhdouglass+clickable@gmail.com> Wed, 02 Sep 2026 00:03:20 -0500

		clickable (8.9.0) unstable; urgency=medium

		* Added support for ubuntu-touch-24.04-2.x framework

docs/_static/version.json

+1 −1

Changes for docs/_static/version.json: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		{
		"version": "8.9.0"
		"version": "8.10.0"
		}
		No newline at end of file