From dac61caea0588a9da713d63d6dc4a558d7b38c66 Mon Sep 17 00:00:00 2001
From: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Date: Mon, 4 Apr 2022 12:40:21 +0200
Subject: [PATCH 1/4] workflows/publish.yml: Run the workflow on success and
 failure only. This prevents trying to run when the trigger was cancelled or
 skipped. In these cases there will be no event file to upload.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
---
 .github/workflows/publish.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e593d80dd50..c270418bfd8 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -14,7 +14,8 @@ jobs:
     runs-on: ubuntu-latest
     if: |
       github.event.workflow_run.event == 'pull_request' &&
-      github.event.workflow_run.conclusion != 'skipped'
+      (github.event.workflow_run.conclusion == 'success' ||
+      (github.event.workflow_run.conclusion == 'failure')
     steps:
       - name: Download and Extract Artifacts
         env:

From ba0bfdf9e15a5ba56d1922a1cbe8793453605718 Mon Sep 17 00:00:00 2001
From: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Date: Mon, 4 Apr 2022 13:07:30 +0200
Subject: [PATCH 2/4] scripts/sketch_utils.sh: Move the logic that gets the
 build dir after the part that retrieves the arguments.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
---
 .github/scripts/sketch_utils.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/scripts/sketch_utils.sh b/.github/scripts/sketch_utils.sh
index 72645d3c0bc..abe3db2b977 100755
--- a/.github/scripts/sketch_utils.sh
+++ b/.github/scripts/sketch_utils.sh
@@ -7,12 +7,6 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <fqbn> <path-to-i
         return 1
     fi
 
-    ARDUINO_CACHE_DIR="$HOME/.arduino/cache.tmp"
-    if [ -z "$ARDUINO_BUILD_DIR" ]; then
-        build_dir="$(dirname $sketch)/build"
-    else
-        build_dir="$ARDUINO_BUILD_DIR"
-    fi
     local ide_path=$1
     local usr_path=$2
     local fqbn=$3
@@ -20,6 +14,15 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <fqbn> <path-to-i
     local xtra_opts=$5
     local win_opts=$6
 
+    ARDUINO_CACHE_DIR="$HOME/.arduino/cache.tmp"
+    if [ -z "$ARDUINO_BUILD_DIR" ]; then
+        build_dir="$(dirname $sketch)/build"
+    else
+        build_dir="$ARDUINO_BUILD_DIR"
+    fi
+
+    echo $sketch
+
     rm -rf "$build_dir"
     mkdir -p "$build_dir"
     mkdir -p "$ARDUINO_CACHE_DIR"

From 087740f446e5d0503135415deaed87b249d68497 Mon Sep 17 00:00:00 2001
From: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Date: Mon, 11 Apr 2022 14:24:48 +0200
Subject: [PATCH 3/4] workflows/hil.yml: Update the HIL runners tags.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
---
 .github/workflows/hil.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/hil.yml b/.github/workflows/hil.yml
index 1a2fd6e97e6..8cb5afa0e80 100644
--- a/.github/workflows/hil.yml
+++ b/.github/workflows/hil.yml
@@ -67,7 +67,12 @@ jobs:
   Test:
     needs: [gen_chunks, Build]
     name: ${{matrix.chip}}-Test#${{matrix.chunks}}
-    runs-on: ESP32
+    runs-on:
+      - ESP32
+      - ESP32-S2
+      - ESP32-S3
+      - ESP32-C3
+
     strategy:
       fail-fast: false
       matrix:

From 5e5f6e458c91526adb6aced013cec8b2ff6fe2e1 Mon Sep 17 00:00:00 2001
From: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Date: Mon, 11 Apr 2022 14:46:32 +0200
Subject: [PATCH 4/4] workflows/hil.yml: Remove the Check Artifacts step.  That
 was only useful for debugging.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
---
 .github/workflows/hil.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/hil.yml b/.github/workflows/hil.yml
index 8cb5afa0e80..037a7432c6e 100644
--- a/.github/workflows/hil.yml
+++ b/.github/workflows/hil.yml
@@ -92,11 +92,6 @@ jobs:
            name: ${{matrix.chip}}-${{matrix.chunks}}.artifacts
            path: tests/
 
-       - name: Check Artifacts
-         run: |
-           ls -R tests
-           cat tests/*/build/build.options.json
-
        - name: Install dependencies
          run: |
            pip install -U pip