From 323bbbf63b758955da9305751ef546329a8a364c Mon Sep 17 00:00:00 2001
From: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Date: Thu, 21 Apr 2022 16:53:37 +0200
Subject: [PATCH] workflows/publish.yml: Run the workflow on success and
 failure only. (#6531)

* 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>

* 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>

* workflows/hil.yml: Update the HIL runners tags.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>

* workflows/hil.yml: Remove the Check Artifacts step.  That was only
useful for debugging.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
---
 .github/scripts/sketch_utils.sh | 15 +++++++++------
 .github/workflows/hil.yml       | 12 ++++++------
 .github/workflows/publish.yml   |  3 ++-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/scripts/sketch_utils.sh b/.github/scripts/sketch_utils.sh
index 72645d3c..abe3db2b 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"
diff --git a/.github/workflows/hil.yml b/.github/workflows/hil.yml
index 1a2fd6e9..037a7432 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:
@@ -87,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
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e593d80d..c270418b 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: