diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2025-09-24 16:04:15 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2025-09-30 19:33:25 +0400 |
| commit | e05b9e3d9b70842e10f49977fc3bbdc91587677e (patch) | |
| tree | 0cb8d850f6a958bfac335818c5e09188be82ac1a /tests/lcitool/refresh | |
| parent | 2086d47992e199c250fcc1dcbc1177590c83ccd4 (diff) | |
| download | focaccia-qemu-e05b9e3d9b70842e10f49977fc3bbdc91587677e.tar.gz focaccia-qemu-e05b9e3d9b70842e10f49977fc3bbdc91587677e.zip | |
tests/lcitool: enable rust & refresh
Enable Rust on various distro images: alpine, centos, debian, fedora, opensuse. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-ID: <20250924120426.2158655-19-marcandre.lureau@redhat.com>
Diffstat (limited to 'tests/lcitool/refresh')
| -rwxr-xr-x | tests/lcitool/refresh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 5c62cdde4a..645959318a 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -63,7 +63,8 @@ add_user_mapping = [ " id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi\n" ] -def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None): +def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None, + enable_rust=True): filename = Path(src_dir, "tests", "docker", "dockerfiles", host + ".docker") cmd = lcitool_cmd + ["dockerfile"] if cross is not None: @@ -75,6 +76,8 @@ def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None): else: trailer = "\n".join(add_user_mapping) + if enable_rust: + trailer += "\nENV ENABLE_RUST 1\n" generate(filename, cmd, trailer) @@ -180,7 +183,9 @@ try: generate_dockerfile("fedora", "fedora-41") generate_dockerfile("opensuse-leap", "opensuse-leap-15") generate_dockerfile("ubuntu2204", "ubuntu-2204", - trailer="".join(ubuntu2204_rust_extras)) + trailer="".join(ubuntu2204_rust_extras), + # https://bugs.launchpad.net/ubuntu/+source/rustc-1.83/+bug/2120318 + enable_rust=False) # # Non-fatal Rust-enabled build @@ -248,7 +253,10 @@ try: project='qemu,qemu-win-installer', cross="mingw64", trailer=cross_build("x86_64-w64-mingw32-", - "x86_64-softmmu")) + "x86_64-softmmu"), + # linking with rust is buggy: + # https://github.com/mesonbuild/meson/pull/14991 + enable_rust=False) # # Cirrus packages lists for GitLab |