Skip to content

Commit 29e5584

Browse files
committed
action: windows: Switch to winget and add dtc
Switch to winget to fetch the Windows dependencies and add `dtc` to them. See zephyrproject-rtos/zephyr#87154 for more info. Requires switching to the Windows Server 2025 image to have winget be a part of the image. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
1 parent f7b7026 commit 29e5584

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

.github/workflows/test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
os: [ubuntu-22.04, macos-13, macos-14, windows-2022]
16+
os: [ubuntu-22.04, macos-13, macos-14, windows-2025]
1717
release: [v3.7.0, v4.0.0, main]
1818
runs-on: ${{ matrix.os }}
1919
steps:

action.yml

+18-4
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,25 @@ runs:
6060
fi
6161
elif [ "${{ runner.os }}" = "macOS" ]; then
6262
brew install ninja ccache qemu dtc
63-
elif [ "${{ runner.os }}" = "Windows" ]; then
64-
choco feature enable -n allowGlobalConfirmation
65-
choco install ninja wget
6663
fi
6764
65+
- name: Install Windows dependencies
66+
if: ${{ runner.os == 'Windows' }}
67+
shell: cmd
68+
#winget install --disable-interactivity --accept-source-agreements Ninja-build.Ninja oss-winget.dtc wget
69+
run: |
70+
winget install --disable-interactivity --accept-source-agreements WingetPathUpdater
71+
winget install --disable-interactivity --accept-source-agreements wget
72+
wget --version
73+
74+
- name: Test winget
75+
if: ${{ runner.os == 'Windows' }}
76+
shell: cmd
77+
run: |
78+
echo "running wget"
79+
wget --version
80+
81+
6882
- name: Initialize
6983
working-directory: ${{ inputs.base-path }}
7084
shell: bash
@@ -158,7 +172,7 @@ runs:
158172
name: Download Zephyr SDK
159173
shell: bash
160174
run: |
161-
wget --progress=dot:giga ${{ inputs.sdk-base }}/v${SDK_VERSION}/${SDK_FILE}
175+
wget --progress=dot:giga ${{ inputs.sdk-base }}/v${SDK_VERSION}/${SDK_FILE}
162176
if [ "${{ runner.os }}" = "Windows" ]; then
163177
7z x $SDK_FILE
164178
mv zephyr-sdk-${SDK_VERSION} zephyr-sdk

0 commit comments

Comments
 (0)