Skip to content

Commit bfb3a38

Browse files
committed
ci(qemu): Fix windows build
1 parent 48cc4b7 commit bfb3a38

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

Diff for: .github/scripts/on-push.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ elif [ "$CHUNK_INDEX" -eq "$CHUNKS_CNT" ]; then
6060
BUILD_PIO=1
6161
fi
6262

63-
if [ "$BUILD_LOG" -le 0 ]; then
63+
if [ -z "$BUILD_LOG" ] || [ "$BUILD_LOG" -le 0 ]; then
6464
BUILD_LOG=0
6565
fi
6666

Diff for: .github/workflows/hil.yml

+7-10
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,9 @@ jobs:
8686
~/.arduino/tests/**/build*.tmp/*.elf
8787
~/.arduino/tests/**/build*.tmp/*.json
8888
89-
wokwi-test:
89+
qemu-test:
9090
needs: [gen_chunks, build]
91-
if: github.event_name == 'schedule'
92-
name: ${{matrix.chip}}-Wokwi_Test#${{matrix.chunks}}
91+
name: ${{matrix.chip}}-QEMU_Test#${{matrix.chunks}}
9392
strategy:
9493
fail-fast: false
9594
matrix:
@@ -118,7 +117,7 @@ jobs:
118117
path: |
119118
~/qemu
120119
~/.cache/pip
121-
key: ${{ steps.get-qemu-version.outputs.release }}-${{ hashFiles('.github/workflows/hil.yml') }}
120+
key: qemu-${{ steps.get-qemu-version.outputs.release }}-${{ hashFiles('.github/workflows/hil.yml') }}
122121

123122
- name: Install dependencies
124123
run: |
@@ -154,11 +153,10 @@ jobs:
154153
name: qemu_results-${{matrix.chip}}-${{matrix.chunks}}
155154
path: tests/*/*.xml
156155

157-
hardware-test:
156+
wokwi-test:
158157
needs: [gen_chunks, build]
159-
name: ${{matrix.chip}}-Hardware_Test#${{matrix.chunks}}
160-
if: |
161-
contains(github.event.pull_request.labels.*.name, 'hil_test') || github.event_name == 'schedule'
158+
if: github.event_name == 'schedule'
159+
name: ${{matrix.chip}}-Wokwi_Test#${{matrix.chunks}}
162160
strategy:
163161
fail-fast: false
164162
matrix:
@@ -174,7 +172,7 @@ jobs:
174172
with:
175173
name: ${{matrix.chip}}-${{matrix.chunks}}.artifacts
176174
path: ~/
177-
175+
178176
- name: Install Wokwi CLI
179177
run: curl -L https://wokwi.com/ci/install.sh | sh
180178

@@ -274,4 +272,3 @@ jobs:
274272
with:
275273
name: Event File
276274
path: ${{github.event_path}}
277-

Diff for: platform.txt

+1-7
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,8 @@ recipe.hooks.objcopy.postobjcopy.1.pattern.windows=cmd /c if exist "{build.path}
169169
recipe.hooks.objcopy.postobjcopy.2.pattern=/usr/bin/env bash -c "[ ! -d "{build.path}"/libraries/ESP_SR ] || [ ! -f "{compiler.sdk.path}"/esp_sr/srmodels.bin ] || cp -f "{compiler.sdk.path}"/esp_sr/srmodels.bin "{build.path}"/srmodels.bin"
170170
recipe.hooks.objcopy.postobjcopy.2.pattern.windows=cmd /c if exist "{build.path}\libraries\ESP_SR" if exist "{compiler.sdk.path}\esp_sr\srmodels.bin" COPY /y "{compiler.sdk.path}\esp_sr\srmodels.bin" "{build.path}\srmodels.bin"
171171

172-
## Create flash_args file
173-
flash_args.path={build.path}/flash_args
174-
recipe.hooks.objcopy.postobjcopy.3.pattern_args=(echo --fill-flash-size {build.flash_size} --flash_mode keep --flash_freq keep --flash_size keep; echo {build.bootloader_addr} "{build.path}/{build.project_name}.bootloader.bin"; echo 0x8000 "{build.path}/{build.project_name}.partitions.bin"; echo 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin"; echo 0x10000 "{build.path}/{build.project_name}.bin") > "{flash_args.path}"
175-
recipe.hooks.objcopy.postobjcopy.3.pattern=/usr/bin/env bash -c "{recipe.hooks.objcopy.postobjcopy.3.pattern_args}"
176-
recipe.hooks.objcopy.postobjcopy.3.pattern.windows=cmd /c {recipe.hooks.objcopy.postobjcopy.3.pattern_args}
177-
178172
# Create merged binary
179-
recipe.hooks.objcopy.postobjcopy.4.pattern_args=--chip {build.mcu} merge_bin -o "{build.path}/{build.project_name}.merged.bin" "@{flash_args.path}"
173+
recipe.hooks.objcopy.postobjcopy.4.pattern_args=--chip {build.mcu} merge_bin -o "{build.path}/{build.project_name}.merged.bin" --fill-flash-size {build.flash_size} --flash_mode keep --flash_freq keep --flash_size keep {build.bootloader_addr} "{build.path}/{build.project_name}.bootloader.bin" 0x8000 "{build.path}/{build.project_name}.partitions.bin" 0xe000 "{runtime.platform.path}/tools/partitions/boot_app0.bin" 0x10000 "{build.path}/{build.project_name}.bin"
180174
recipe.hooks.objcopy.postobjcopy.4.pattern="{tools.esptool_py.path}/{tools.esptool_py.cmd}" {recipe.hooks.objcopy.postobjcopy.4.pattern_args}
181175
recipe.hooks.objcopy.postobjcopy.4.pattern.linux=python3 "{tools.esptool_py.path}/{tools.esptool_py.cmd}" {recipe.hooks.objcopy.postobjcopy.4.pattern_args}
182176

0 commit comments

Comments
 (0)