From 3e9ee908f86519f14003145ed2a3f2ad112c10b0 Mon Sep 17 00:00:00 2001 From: Hampus Date: Sat, 3 Oct 2026 18:20:58 +0200 Subject: [PATCH] fix(ci): accept the static image's compound license label (#3174) --- tools/ci/src/ci_workflow.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/ci/src/ci_workflow.rs b/tools/ci/src/ci_workflow.rs index c2db6243b..807d4053a 100644 --- a/tools/ci/src/ci_workflow.rs +++ b/tools/ci/src/ci_workflow.rs @@ -336,8 +336,7 @@ mod tests { #[test] fn image_dockerfiles_include_the_release_label_block() { - const REQUIRED: [&str; 9] = [ - "LABEL org.opencontainers.image.licenses=\"AGPL-3.0-or-later\"", + const REQUIRED: [&str; 8] = [ "LABEL org.opencontainers.image.vendor=\"Fluxer\"", "LABEL org.opencontainers.image.url=\"https://fluxer.app\"", "LABEL org.opencontainers.image.documentation=\"https://docs.fluxer.app\"", @@ -427,6 +426,16 @@ mod tests { dockerfile.contains(&format!("LABEL org.opencontainers.image.title=\"{title}\"")), "{name}/Dockerfile must declare the title {title}" ); + let licenses = match name { + "fluxer_static" => "AGPL-3.0-or-later AND CC-BY-SA-4.0 AND CC-BY-4.0", + _ => "AGPL-3.0-or-later", + }; + assert!( + dockerfile.contains(&format!( + "LABEL org.opencontainers.image.licenses=\"{licenses}\"" + )), + "{name}/Dockerfile must declare the licenses {licenses}" + ); for label in REQUIRED { assert!( dockerfile.contains(label),