Skip to content

Commit 14a7fc8

Browse files
committed
Merge branch 'master' into test
2 parents 70824ed + 72c195c commit 14a7fc8

File tree

6 files changed

+6
-11
lines changed

6 files changed

+6
-11
lines changed

.github/workflows/tests.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@ on:
55
pull_request:
66
types: [opened, reopened, synchronize, labeled, unlabeled]
77
paths:
8-
- '.github/workflows/tests.yml'
9-
- '.github/workflows/build_tests.yml'
10-
- '.github/workflows/hw.yml'
11-
- '.github/workflows/qemu.yml'
12-
- '.github/workflows/wokwi.yml'
13-
- '.github/workflows/tests_publish.yml'
8+
- '.github/workflows/tests*.yml'
149
- '.github/scripts/*.sh'
1510
- '!.github/scripts/check-cmakelists.sh'
1611
- '!.github/scripts/find_*'
@@ -77,7 +72,7 @@ jobs:
7772
7873
call-build-tests:
7974
name: Build
80-
uses: ./.github/workflows/build_tests.yml
75+
uses: ./.github/workflows/tests_build.yml
8176
needs: gen-matrix
8277
strategy:
8378
matrix:
@@ -91,7 +86,7 @@ jobs:
9186

9287
call-hardware-tests:
9388
name: Hardware
94-
uses: ./.github/workflows/hw.yml
89+
uses: ./.github/workflows/tests_hw.yml
9590
needs: [gen-matrix, call-build-tests]
9691
if: |
9792
github.repository == 'espressif/arduino-esp32' &&
@@ -109,7 +104,7 @@ jobs:
109104
# This job is disabled for now
110105
call-qemu-tests:
111106
name: QEMU
112-
uses: ./.github/workflows/qemu.yml
107+
uses: ./.github/workflows/tests_qemu.yml
113108
needs: [gen-matrix, call-build-tests]
114109
if: false
115110
strategy:
File renamed without changes.
File renamed without changes.

.github/workflows/tests_publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
core.debug(`repo: ${repo}`);
6161
core.debug(`sha: ${sha}`);
6262
const { context: name, state } = (await github.rest.repos.createCommitStatus({
63-
context: 'Runtime Tests / Report results (${{ github.event.workflow_run.event }} -> workflow_run -> workflow_run)',
63+
context: 'Runtime Tests / Report results (${{ env.original_event }} -> workflow_run -> workflow_run)',
6464
owner: owner,
6565
repo: repo,
6666
sha: sha,

.github/workflows/qemu.yml renamed to .github/workflows/tests_qemu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
with:
9797
path: |
9898
~/qemu
99-
key: qemu-${{ steps.get-qemu-version.outputs.release }}-${{ hashFiles('.github/workflows/qemu.yml') }}
99+
key: qemu-${{ steps.get-qemu-version.outputs.release }}-${{ hashFiles('.github/workflows/tests_qemu.yml') }}
100100

101101
- name: Download QEMU
102102
if: ${{ steps.cache-qemu.outputs.cache-hit != 'true' && steps.check-tests.outputs.enabled == 'true' }}
File renamed without changes.

0 commit comments

Comments
 (0)