From 5a75c012907aa3be588021c4435ae8d98a5d5b94 Mon Sep 17 00:00:00 2001 From: Piotr Hoppe Date: Tue, 1 Sep 2026 14:06:49 +0200 Subject: [PATCH 1/4] ci: zephyr: fix Linux/Windows artifact comparison Preserve the complete artifact suffix when deriving Linux artifact names from Windows artifact names. Fixes #11148 Signed-off-by: Piotr Hoppe --- .github/workflows/zephyr.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index c002dbc7a0c9..e7f2af312bf9 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -511,7 +511,8 @@ jobs: set -x for windir in windows-build*; do - lindir=linux-"${windir#windows-}" + # Remove "windows-build" prefix and prepend "linux-build" + lindir="linux-build${windir#windows-build}" diff -qr "$lindir" "$windir" || : $((diffs++)) done exit $diffs From 802559b8953616a5f9dddfc6801604597492e8dc Mon Sep 17 00:00:00 2001 From: Piotr Hoppe Date: Tue, 1 Sep 2026 16:46:48 +0200 Subject: [PATCH 2/4] ci: zephyr: fix Linux/Windows artifact comparison Preserve the complete artifact suffix when deriving Linux artifact names from Windows artifact names. Fixes #11148 Signed-off-by: Piotr Hoppe --- .github/workflows/zephyr.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index e7f2af312bf9..91cf1572b432 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -511,8 +511,10 @@ jobs: set -x for windir in windows-build*; do - # Remove "windows-build" prefix and prepend "linux-build" - lindir="linux-build${windir#windows-build}" - diff -qr "$lindir" "$windir" || : $((diffs++)) + lindir=linux-"${windir#windows-}" + diff -qr --exclude="$dir"/build-sof-staging/sof-info/*/stripped-main.elf \ + diff -qr --exclude="$dir"/build-sof-staging/sof-info/*/stripped-zephyr.elf \ + diff -qr --exclude="$dir"/build-sof-staging/sof-info/*/zephyr.lst \ + "$lindir" "$windir" || : $((diffs++)) done exit $diffs From b9db5a93b764603e8e3ce91609a956a8bd9d109b Mon Sep 17 00:00:00 2001 From: Piotr Hoppe Date: Tue, 1 Sep 2026 19:55:58 +0200 Subject: [PATCH 3/4] ci: zephyr: fix Linux/Windows artifact comparison Preserve the complete artifact suffix when deriving Linux artifact names from Windows artifact names. Fixes #11148 Signed-off-by: Piotr Hoppe --- .github/workflows/zephyr.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index 91cf1572b432..02d00f72d6fa 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -512,9 +512,9 @@ jobs: set -x for windir in windows-build*; do lindir=linux-"${windir#windows-}" - diff -qr --exclude="$dir"/build-sof-staging/sof-info/*/stripped-main.elf \ - diff -qr --exclude="$dir"/build-sof-staging/sof-info/*/stripped-zephyr.elf \ - diff -qr --exclude="$dir"/build-sof-staging/sof-info/*/zephyr.lst \ + diff -qr --exclude=build-sof-staging/sof-info/*/stripped-main.elf \ + diff -qr --exclude=build-sof-staging/sof-info/*/stripped-zephyr.elf \ + diff -qr --exclude=build-sof-staging/sof-info/*/zephyr.lst \ "$lindir" "$windir" || : $((diffs++)) done exit $diffs From 02ad7174f2536804b4a705b28d5c2e94a3fec301 Mon Sep 17 00:00:00 2001 From: Piotr Hoppe Date: Wed, 2 Sep 2026 10:27:57 +0200 Subject: [PATCH 4/4] ci: zephyr: fix Linux/Windows artifact comparison Preserve the complete artifact suffix when deriving Linux artifact names from Windows artifact names. Fixes #11148 Signed-off-by: Piotr Hoppe --- .github/workflows/zephyr.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index 02d00f72d6fa..c002dbc7a0c9 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -512,9 +512,6 @@ jobs: set -x for windir in windows-build*; do lindir=linux-"${windir#windows-}" - diff -qr --exclude=build-sof-staging/sof-info/*/stripped-main.elf \ - diff -qr --exclude=build-sof-staging/sof-info/*/stripped-zephyr.elf \ - diff -qr --exclude=build-sof-staging/sof-info/*/zephyr.lst \ - "$lindir" "$windir" || : $((diffs++)) + diff -qr "$lindir" "$windir" || : $((diffs++)) done exit $diffs