Skip to content

[SKIP SOF-TEST] .github/zephyr: align hal_xtensa when compiling with Zephyr main branch #7586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ranj063 merged 1 commit into from
May 12, 2023
Merged

[SKIP SOF-TEST] .github/zephyr: align hal_xtensa when compiling with Zephyr main branch #7586

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions .github/workflows/zephyr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,28 @@ jobs:

- name: select zephyr revision
run: |
cd workspace/zephyr/
cd workspace
if [ 'mnfst' != '${{ matrix.zephyr_revision }}' ]; then
case '${{ matrix.zephyr_revision }}' in
'zmain') rem_rev='https://github.com/zephyrproject-rtos/zephyr main' ;;
'zmain') rem_rev='main' ;;
*) echo 'Unknown matrix.zephyr_revision'; exit 1 ;;
esac
git fetch $rem_rev
git checkout FETCH_HEAD
( cd sof/submanifests/
sed -e "s#=sof_zephyr_revision_override=#${rem_rev}#" \
sof-ci-jenkins/zephyr-override-template.yml > test-zephyr-main.yml
)
west update --narrow --fetch-opt=--filter=tree:0
# For some unknown reason `west` fetches using the literal remote URL
# which breaks --decorate. Maybe zephyrproject-rtos/west/pull/346 has
# some relevant background? For now `west` uses the remote name
# `zephyrproject`, use that knowledge to fix --decorate but ignore any
# failure in case the name changes or some other issue.
git -C zephyr/ fetch '--filter=tree:0' zephyrproject "${rem_rev}" || true
fi
git log --oneline -n 5 --decorate --graph --no-abbrev-commit
set -x
west list
west status
git -C zephyr/ log --oneline -n 5 --decorate --graph --no-abbrev-commit

# Not strictly necessary but saves a lot of scrolling in the next step
# Caching a 12G image is unfortunately not possible:
Expand Down