Skip to content

Commit ff095d9

Browse files
committed
Merge branch 'ci/hw_gitlab'
2 parents ea382df + 04f6788 commit ff095d9

File tree

23 files changed

+914
-249
lines changed

23 files changed

+914
-249
lines changed

.github/scripts/tests_matrix.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ targets="'esp32','esp32s2','esp32s3','esp32c3','esp32c6','esp32h2','esp32p4'"
1717
mkdir -p info
1818

1919
echo "[$wokwi_types]" > info/wokwi_types.txt
20+
echo "[$hw_types]" > info/hw_types.txt
2021
echo "[$targets]" > info/targets.txt
2122

2223
{

.github/workflows/tests.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -89,23 +89,6 @@ jobs:
8989
type: ${{ matrix.type }}
9090
chip: ${{ matrix.chip }}
9191

92-
call-hardware-tests:
93-
name: Hardware
94-
uses: ./.github/workflows/tests_hw.yml
95-
needs: [gen-matrix, call-build-tests]
96-
if: |
97-
github.repository == 'espressif/arduino-esp32' &&
98-
(github.event_name != 'pull_request' ||
99-
contains(github.event.pull_request.labels.*.name, 'hil_test'))
100-
strategy:
101-
fail-fast: false
102-
matrix:
103-
type: ${{ fromJson(needs.gen-matrix.outputs.hw-types) }}
104-
chip: ${{ fromJson(needs.gen-matrix.outputs.targets) }}
105-
with:
106-
type: ${{ matrix.type }}
107-
chip: ${{ matrix.chip }}
108-
10992
# This job is disabled for now
11093
call-qemu-tests:
11194
name: QEMU
@@ -121,4 +104,4 @@ jobs:
121104
type: ${{ matrix.type }}
122105
chip: ${{ matrix.chip }}
123106

124-
# Wokwi tests are run after this workflow as it needs access to secrets
107+
# Hardware and Wokwi tests are run after this workflow as they need access to secrets

.github/workflows/tests_hw.yml

Lines changed: 0 additions & 122 deletions
This file was deleted.

0 commit comments

Comments
 (0)