From ace50a295dafcf85e3fccfd2af23001bcb6065fe Mon Sep 17 00:00:00 2001 From: Quentin VIGNAUD Date: Fri, 5 Dec 2025 17:30:02 +0100 Subject: [PATCH] Trying other stuff --- .melodium-ci/lib-root.mel | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.melodium-ci/lib-root.mel b/.melodium-ci/lib-root.mel index 14d7489b..3a547641 100644 --- a/.melodium-ci/lib-root.mel +++ b/.melodium-ci/lib-root.mel @@ -43,21 +43,21 @@ treatment buildTestAya(const api_token: string, const github_contexts: string = triggerFinish: trigger() startup.trigger -> prepareContexts.trigger,ready -> concentratedFinish.trigger,data -> triggerFinish.stream,end -> manageLogs.stop - build_aarch64: buildTestAyaForArchUsingImage[logger=logger, dispatcher=dispatcher, github_contexts=github_contexts, finish_concentrator=finish_concentrator]( + build_aarch64: /*buildTestAyaForArchUsingImage[logger=logger, dispatcher=dispatcher, github_contexts=github_contexts, finish_concentrator=finish_concentrator]( short_rust_arch="aarch64", full_rust_arch="aarch64-unknown-linux-gnu", ubuntu_arch="arm64", image="ghcr.io/taiki-e/rust-cross-toolchain:aarch64-unknown-linux-gnu-dev-amd64", repository_clone_ref=repository_clone_ref, repository_clone_url=repository_clone_url - ) - /*buildTestAyaForArch[logger=logger, dispatcher=dispatcher, github_contexts=github_contexts, finish_concentrator=finish_concentrator]( + )*/ + buildTestAyaForArch[logger=logger, dispatcher=dispatcher, github_contexts=github_contexts, finish_concentrator=finish_concentrator]( short_rust_arch="aarch64", full_rust_arch="aarch64-unknown-linux-gnu", ubuntu_arch="arm64", repository_clone_ref=repository_clone_ref, repository_clone_url=repository_clone_url - )*/ + ) /*build_armv7: buildTestAyaForArch[logger=logger, dispatcher=dispatcher, github_contexts=github_contexts, finish_concentrator=finish_concentrator]( short_rust_arch="armv7", full_rust_arch="armv7-unknown-linux-gnueabi", @@ -151,9 +151,8 @@ treatment buildTestAyaForArch[logger: Logger, dispatcher: CicdDispatchEngine, gi executor_name = "rust", commands = |raw_commands([ |format("dpkg --add-architecture {arch}", |entry("arch", ubuntu_arch)), - "/usr/bin/systemctl mask docker.service docker.socket", "apt-get update", - |format("bash -c \"apt-get install -y liblzma-dev:{arch} qemu-user ; exit 0\"", |entry("arch", ubuntu_arch)), + |format("apt-get install -y podman podman-docker liblzma-dev:{arch} qemu-user", |entry("arch", ubuntu_arch)), ${bash -c "curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/taiki-e/setup-cross-toolchain-action/refs/tags/v1/main.sh | bash -"}, "cat /tmp/github.env" ]),