summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2023-12-11 14:43:54 +0700
committerhathach <[email protected]>2023-12-11 14:43:54 +0700
commitc8291168301b597f586d15510c780a9bdb8d0e69 (patch)
treede9228aef94af7a7e385aa9e62a66a6d5436136c
parent3689c4c60400d95178063199e713b9dc1405a199 (diff)
extract artifacts to same folder structure as ci build
-rw-r--r--.github/workflows/build_esp.yml2
-rw-r--r--.github/workflows/cmake_arm.yml7
-rw-r--r--test/hil/hil_test.py8
3 files changed, 3 insertions, 14 deletions
diff --git a/.github/workflows/build_esp.yml b/.github/workflows/build_esp.yml
index 62bdb266c..c3fd53bf6 100644
--- a/.github/workflows/build_esp.yml
+++ b/.github/workflows/build_esp.yml
@@ -78,7 +78,6 @@ jobs:
matrix:
board:
- 'espressif_s3_devkitc'
-
steps:
- name: Clean workspace
run: |
@@ -95,6 +94,7 @@ jobs:
uses: actions/download-artifact@v3
with:
name: ${{ matrix.board }}
+ path: cmake-build/cmake-build-${{ matrix.board }}
- name: Test on actual hardware
run: |
diff --git a/.github/workflows/cmake_arm.yml b/.github/workflows/cmake_arm.yml
index c8f8fb99a..1ec90b10a 100644
--- a/.github/workflows/cmake_arm.yml
+++ b/.github/workflows/cmake_arm.yml
@@ -108,7 +108,6 @@ jobs:
matrix:
board:
- 'raspberry_pi_pico'
-
steps:
- name: Clean workspace
run: |
@@ -127,12 +126,6 @@ jobs:
name: ${{ matrix.board }}
path: cmake-build/cmake-build-${{ matrix.board }}
- - name: Display structure of downloaded files
- run: ls -R
- working-directory: cmake-build/cmake-build-${{ matrix.board }}
-
- - run: tree
-
- name: Test on actual hardware
run: |
python3 test/hil/hil_test.py --board ${{ matrix.board }} hil_pi4.json
diff --git a/test/hil/hil_test.py b/test/hil/hil_test.py
index a6932cfcc..1b1349fb8 100644
--- a/test/hil/hil_test.py
+++ b/test/hil/hil_test.py
@@ -304,14 +304,10 @@ def main(config_file, board):
test_list.remove(skip)
for test in test_list:
+ # cmake, make
fw_list = [
- # cmake build
f'cmake-build/cmake-build-{item["name"]}/device/{test}/{test}.elf',
- # make build
- f'examples/device/{test}/_build/{item["name"]}/{test}.elf',
- # artifacts: esp32 use bin file
- f'device/{test}/{test}.elf'
- f'device/{test}/{test}.bin'
+ f'examples/device/{test}/_build/{item["name"]}/{test}.elf'
]
fw = None