Skip to content

Commit

Permalink
.github/zephyr: align git fetch and describe across Windows and Linux
Browse files Browse the repository at this point in the history
Fetching different tags causes `git describe` output to be different.

Fixes commit 68b49c1 (".github/zephyr: switch Windows build to west
update --narrow")

Signed-off-by: Marc Herbert <[email protected]>
  • Loading branch information
marc-hb authored and kv2019i committed Jan 23, 2023
1 parent 1abfb34 commit 1193203
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion .github/workflows/zephyr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ jobs:
# a "roughly 4-month release" but for now that saves only 100MB
# https://docs.zephyrproject.org/latest/project/release_process.html
- name: west clones

# Get some git tags in Zephyr. keep in sync with build-windows below
run: pip3 install west && cd workspace/sof/ && west init -l &&
west update --narrow --fetch-opt=--depth=5 &&
git -C ../zephyr fetch --shallow-exclude=v3.2.0-rc3
Expand Down Expand Up @@ -215,7 +217,10 @@ jobs:

- name: West clone
working-directory: ${{ github.workspace }}/workspace
run: west init -l sof && west update --narrow
# Keep in sync with build-linux above
run: west init -l sof &&
west update --narrow --fetch-opt=--depth=5 &&
git -C zephyr fetch --shallow-exclude=v3.2.0-rc3

# Call Setup Python again to save the PIP packages in cache
- name: Setup Python
Expand Down

0 comments on commit 1193203

Please sign in to comment.