Skip to content

[SKIP SOF-TEST] .github: fix stable-v2.7 branch #8406

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
marc-hb merged 2 commits into from
Oct 27, 2023
Merged

[SKIP SOF-TEST] .github: fix stable-v2.7 branch #8406

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd969bc
.github/zephyr: de-hardcode the remote name in the Windows build too
marc-hb Oct 23, 2023
bc315c6
.github: build-windows: choco install ninja
marc-hb Sep 22, 2023
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
13 changes: 12 additions & 1 deletion .github/workflows/zephyr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ jobs:
# Get some tags to fix `git describe`, see build-linux comments above.
cd zephyr
$_rev = "$(git rev-parse HEAD)"
git fetch --filter=tree:0 zephyrproject "${_rev}:_branch_placeholder"
git fetch --filter=tree:0 "$(west list -f '{url}' zephyr)" "${_rev}:_branch_placeholder"
git branch -D _branch_placeholder


Expand All @@ -328,7 +328,18 @@ jobs:
working-directory: ${{ github.workspace }}/workspace
run: pip install -r zephyr/scripts/requirements.txt

# Ninja has been coming and going, see #8250
- name: choco install ninja
run: |
choco install ninja
ninja.exe --version

# MSYS2 provides gcc x64_86 toolchain & openssl
# Installs in D:/a/_temp/msys64
#
# Note there is already C:/msys64/ provided by
# https://github.com/actions/runner-images/blob/win22/20230918.1/images/win/Windows2022-Readme.md
# Is it not good enough? Maybe it could save 20-30s.
- name: Initialize MSYS2
uses: msys2/setup-msys2@v2
with:
Expand Down