Skip to content

Commit

Permalink
github: workflows: Refactor upstream build workflow
Browse files Browse the repository at this point in the history
This updates the manifest in the upstream build workflow before setting up
the Zephyr project. This way the manifest is correct from the very
beginning, speeding up the setup process. The manifest is also updated
using a YAML processor, which is more robust.

Signed-off-by: Kalle Kietäväinen <[email protected]>
  • Loading branch information
kietavainen committed Dec 9, 2024
1 parent 2208911 commit fb99e51
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/upstream-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,18 @@ jobs:
run: |
pip3 install crc
- name: Update manifest to point at upstream main branch
working-directory: zephyr-silabs
shell: bash
run: |
yq -i '(.manifest.projects[] | select(.name == "zephyr") | .revision) = "main"' west.yml
- name: Setup Zephyr project
uses: zephyrproject-rtos/action-zephyr-setup@v1
with:
app-path: zephyr-silabs
toolchains: arm-zephyr-eabi

- name: Update manifest to point at upstream main branch
working-directory: zephyr-silabs
shell: bash
run: |
Z_REV=`west list zephyr -f {revision}`
sed s/$Z_REV/main/ west.yml > west.yml.new
mv west.yml.new west.yml
west update
- name: Fetch blobs
working-directory: zephyr-silabs
shell: bash
Expand Down

0 comments on commit fb99e51

Please sign in to comment.