From 72d50f47830a602ae07bfed03f7d57f459363044 Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Wed, 12 Apr 2023 01:37:43 +0300 Subject: [PATCH 1/3] Update repository_dispatch.sh --- tools/repository_dispatch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/repository_dispatch.sh b/tools/repository_dispatch.sh index 8b2d1b888..fff912b07 100644 --- a/tools/repository_dispatch.sh +++ b/tools/repository_dispatch.sh @@ -29,7 +29,7 @@ else commit="" if [ ! "$tag" == "" ] && [ ! "$tag" == "null" ]; then export IDF_TAG="$tag" - if [ ! "$branch" == "" ] && [ ! "$branch" == "null" ]; then + elif [ ! "$branch" == "" ] && [ ! "$branch" == "null" ]; then export IDF_BRANCH="$branch" fi fi From 17802717de6b8fa400ab0bb06e614443e152c6fa Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Wed, 12 Apr 2023 19:18:53 +0300 Subject: [PATCH 2/3] Update deploy and dispatch scripts to match v5.1 --- tools/cron.sh | 3 ++- tools/repository_dispatch.sh | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/cron.sh b/tools/cron.sh index 6122b1eed..2a3fb88cd 100644 --- a/tools/cron.sh +++ b/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 diff --git a/tools/repository_dispatch.sh b/tools/repository_dispatch.sh index fff912b07..15198e98e 100644 --- a/tools/repository_dispatch.sh +++ b/tools/repository_dispatch.sh @@ -14,7 +14,7 @@ commit=`echo "$payload" | jq -r '.commit'` builder=`echo "$payload" | jq -r '.builder'` arduino=`echo "$payload" | jq -r '.arduino'` -echo "Action: $action, Branch: $branch, Tag: $tag, Commit: $commit, Builder: $builder, Arduino: $arduino" +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" @@ -42,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 From ace36a9bd9b3362a809f5b2cc43accf4de2f946a Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Tue, 25 Apr 2023 03:07:28 +0300 Subject: [PATCH 3/3] Update build badge in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 27584c82c..054523e5f 100644 --- a/README.md +++ b/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.