Merge branch 'master' into release/v4.4

Author: me-no-dev

.github/workflows/cron.yml

@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        idf_branch: [release/v4.4] #, release/v3.3]
+        idf_branch: [release/v5.1, release/v4.4] #, release/v3.3]
     steps:
     - uses: actions/checkout@v1
     - name: Install dependencies

README.md

@@ -1,4 +1,4 @@
-# ESP32 Arduino Lib Builder [![Build Status](https://travis-ci.org/espressif/esp32-arduino-lib-builder.svg?branch=master)](https://travis-ci.org/espressif/esp32-arduino-lib-builder)
+# ESP32 Arduino Lib Builder [![ESP32 Arduino Libs CI](https://github.com/espressif/esp32-arduino-lib-builder/actions/workflows/push.yml/badge.svg)](https://github.com/espressif/esp32-arduino-lib-builder/actions/workflows/push.yml)
 
 This repository contains the scripts that produce the libraries included with esp32-arduino.
 

tools/copy-libs.sh

@@ -359,7 +359,7 @@ for item; do
 		ipath="$item"
 		fname=`basename "$ipath"`
 		dname=`basename $(dirname "$ipath")`
-		if [[ "$fname" == "main" && "$dname" == "esp32-arduino-lib-builder" ]]; then
+		if [[ "$fname" == "main" && "$dname" == $(basename "$PWD") ]]; then
 			continue
 		fi
 		while [[ "$dname" != "components" && "$dname" != "managed_components" && "$dname" != "build" ]]; do

tools/cron.sh

@@ -6,5 +6,6 @@ if [ ! "$GITHUB_EVENT_NAME" == "schedule" ]; then
 fi
 
 git checkout "$IDF_BRANCH" #local branches should match what the matrix wants to build
+DEPLOY_OUT=1
 source ./build.sh
-bash ./tools/push-to-arduino.sh
+# bash ./tools/push-to-arduino.sh

tools/repository_dispatch.sh

@@ -9,11 +9,12 @@ EVENT_JSON=`cat "$GITHUB_EVENT_PATH"`
 action=`echo "$EVENT_JSON" | jq -r '.action'`
 payload=`echo "$EVENT_JSON" | jq -r '.client_payload'`
 branch=`echo "$payload" | jq -r '.branch'`
+tag=`echo "$payload" | jq -r '.tag'`
 commit=`echo "$payload" | jq -r '.commit'`
 builder=`echo "$payload" | jq -r '.builder'`
 arduino=`echo "$payload" | jq -r '.arduino'`
 
-echo "Action: $action, Branch: $branch, Commit: $commit, Builder: $builder"
+echo "Action: $action, Branch: $branch, Tag: $tag, Commit: $commit, Builder: $builder, Arduino: $arduino, Actor: $GITHUB_ACTOR"
 
 if [ ! "$action" == "deploy" ] && [ ! "$action" == "build" ]; then
     echo "Bad Action $action"
@@ -26,7 +27,9 @@ if [ ! "$commit" == "" ] && [ ! "$commit" == "null" ]; then
     export IDF_COMMIT="$commit"
 else
     commit=""
-    if [ ! "$branch" == "" ] && [ ! "$branch" == "null" ]; then
+    if [ ! "$tag" == "" ] && [ ! "$tag" == "null" ]; then
+        export IDF_TAG="$tag"
+    elif [ ! "$branch" == "" ] && [ ! "$branch" == "null" ]; then
         export IDF_BRANCH="$branch"
     fi
 fi
@@ -39,8 +42,12 @@ if [ ! "$arduino" == "" ] && [ ! "$arduino" == "null" ]; then
     export AR_BRANCH="$arduino"
 fi
 
-source ./build.sh
-
 if [ "$action" == "deploy" ]; then
-    bash ./tools/push-to-arduino.sh
+    DEPLOY_OUT=1
 fi
+
+source ./build.sh
+
+# if [ "$action" == "deploy" ]; then
+#     bash ./tools/push-to-arduino.sh
+# fi