Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions .github/workflows/zephyr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ jobs:
# Search "zephyr_revision" and see below what they expand to.
zephyr_revision: [
mnfst, # special value: don't override sof/west.yml
Copy link

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the zephyr_revision flow sequence, mnfst still has a trailing comma after removing zmain. YAML flow sequences are typically strict about trailing commas, and this can cause the workflow to fail to parse. Remove the trailing comma (or switch to block-style list) now that there's only one entry.

Suggested change
mnfst, # special value: don't override sof/west.yml
mnfst # special value: don't override sof/west.yml

Copilot uses AI. Check for mistakes.
zmain, # Zephyr's main branch
]
# Using groups to avoid spamming the small results box with too
# many lines. Pay attention to COMMAS.
Expand Down Expand Up @@ -167,15 +166,7 @@ jobs:
if [ 'mnfst' = '${{ matrix.zephyr_revision }}' ]; then
rem_rev=$(git -C zephyr rev-parse HEAD)
else
case '${{ matrix.zephyr_revision }}' in
'zmain') rem_rev='main' ;;
*) echo 'Unknown matrix.zephyr_revision'; exit 1 ;;
esac
( cd sof/submanifests/
sed -e "s#=sof_zephyr_revision_override=#${rem_rev}#" \
sof-ci-jenkins/zephyr-override-template.yml > test-zephyr-main.yml
)
time west update --narrow --fetch-opt=--filter=tree:0
echo 'Unknown matrix.zephyr_revision'; exit 1
fi
Comment on lines +169 to 170
Copy link

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After removing the zmain option, there is still a comment later in this job that says "especially in the "zmain" case". Please update/remove that stale reference so the workflow documentation matches the supported zephyr_revision values.

Copilot uses AI. Check for mistakes.

# Get some tags to fix `git describe` hence BUILD_VERSION, etc.
Expand Down
Loading