From 23c4945d46b16d647cd3957f5b653fb8f04ea8df Mon Sep 17 00:00:00 2001 From: tobozo Date: Tue, 21 May 2024 15:15:13 +0200 Subject: [PATCH] changed data source to dl.espressif.com/dl/esp-idf/idf_versions.js --- .github/scripts/esp-idf-versions.php | 6 +++--- .github/workflows/IDFBuild.yml | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/scripts/esp-idf-versions.php b/.github/scripts/esp-idf-versions.php index c0cb269c..da7c1613 100644 --- a/.github/scripts/esp-idf-versions.php +++ b/.github/scripts/esp-idf-versions.php @@ -73,13 +73,13 @@ array_push($fqbns, ...$hardcoded_fqbns); // print the json and exit -php_die( json_encode( [ "esp-idf-fqbn" => $fqbns ], JSON_PRETTY_PRINT ) ); +php_die( json_encode( [ "esp-idf-fqbn" => $fqbns ], JSON_PRETTY_PRINT ), 0 ); // same as die() with with end of line -function php_die($msg) +function php_die($msg, $errcode=1) { echo $msg.PHP_EOL; - exit(1); + exit($errcode); } diff --git a/.github/workflows/IDFBuild.yml b/.github/workflows/IDFBuild.yml index 68d06af8..f87b3488 100644 --- a/.github/workflows/IDFBuild.yml +++ b/.github/workflows/IDFBuild.yml @@ -42,9 +42,8 @@ jobs: - name: Setup matrix id: set-matrix run: | - php .github/scripts/esp-idf-versions.php matrix=`php .github/scripts/esp-idf-versions.php` - echo $matrix | jq # debug + # echo $matrix | jq # debug matrix="${matrix//'%'/'%25'}" # escape percent entities matrix="${matrix//$'\n'/''}" # remove lf matrix="${matrix//$'\r'/''}" # remove cr