Skip to content

[SKIP CI] .github/zephyr: move zephyr revision in first results matrix position #7446

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
kv2019i merged 1 commit into from
Apr 19, 2023
Merged

[SKIP CI] .github/zephyr: move zephyr revision in first results matrix position #7446

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
29 changes: 18 additions & 11 deletions .github/workflows/zephyr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ jobs:
strategy:
fail-fast: false
matrix:
# These keys are kept short because Github's left column is not resizable.
# Search "zephyr_revision" and see below what they expand to.
zephyr_revision: [
mnfst, # special value: don't override sof/west.yml
zmain, # Zephyr's main branch
]
# Using groups to avoid spamming the small results box with too
# many lines. Pay attention to COMMAS.
IPC_platforms: [
Expand All @@ -74,10 +80,6 @@ jobs:
# Temporary testbed for Zephyr development.
-i IPC4 tgl tgl-h,
]
zephyr_revision: [
manifest_revision,
"https://github.com/zephyrproject-rtos/zephyr main",
]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -111,12 +113,17 @@ jobs:
git -C ../zephyr fetch --shallow-exclude=v3.2.0-rc3

- name: select zephyr revision
run: cd workspace/zephyr/ &&
if [ 'manifest_revision' != '${{ matrix.zephyr_revision }}' ]; then
git fetch ${{ matrix.zephyr_revision }} &&
git checkout FETCH_HEAD;
fi &&
git log --oneline -n 5 --decorate --graph --no-abbrev-commit
run: |
cd workspace/zephyr/
if [ 'mnfst' != '${{ matrix.zephyr_revision }}' ]; then
case '${{ matrix.zephyr_revision }}' in
'zmain') rem_rev='https://github.com/zephyrproject-rtos/zephyr main' ;;
*) echo 'Unknown matrix.zephyr_revision'; exit 1 ;;
esac
git fetch $rem_rev
git checkout FETCH_HEAD
fi
git 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 All @@ -135,7 +142,7 @@ jobs:

- name: Upload build artifacts
uses: actions/upload-artifact@v3
if: ${{ matrix.zephyr_revision == 'manifest_revision' }}
if: ${{ matrix.zephyr_revision == 'mnfst' }}
with:
name: linux-build ${{ matrix.IPC_platforms }}
path: |
Expand Down