From 9d2d2578517d674ae54426e7ba6cf79332ec6ae0 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Sun, 23 Jul 2023 18:08:54 +0200 Subject: [PATCH] Scripts: call `wandbox/publish.sh` from `get-release-page.sh` Ported from 371fa4667e5a0d2ad7c44d5aa9e4dae2cc22edd8 --- extras/scripts/get-release-page.sh | 4 ++-- extras/scripts/publish.sh | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/extras/scripts/get-release-page.sh b/extras/scripts/get-release-page.sh index 2acb8d8e..9bf943ef 100755 --- a/extras/scripts/get-release-page.sh +++ b/extras/scripts/get-release-page.sh @@ -4,14 +4,14 @@ set -eu VERSION="$1" CHANGELOG="$2" -FRONTMATTER="$3" +ARDUINOJSON_H="$3" cat << END --- branch: v6 version: $VERSION date: '$(date +'%Y-%m-%d')' -$(cat "$FRONTMATTER") +$(extras/scripts/wandbox/publish.sh "$ARDUINOJSON_H") --- $(awk '/\* /{ FOUND=1; print; next } { if (FOUND) exit}' "$CHANGELOG") diff --git a/extras/scripts/publish.sh b/extras/scripts/publish.sh index d2a2ebc9..af9546a6 100755 --- a/extras/scripts/publish.sh +++ b/extras/scripts/publish.sh @@ -73,7 +73,6 @@ push extras/scripts/build-arduino-package.sh . "../ArduinoJson-$TAG.zip" extras/scripts/build-single-header.sh "src/ArduinoJson.h" "../ArduinoJson-$TAG.h" extras/scripts/build-single-header.sh "src/ArduinoJson.hpp" "../ArduinoJson-$TAG.hpp" -extras/scripts/wandbox/publish.sh "../ArduinoJson-$TAG.h" > "../ArduinoJson-$TAG-wandbox.txt" || echo "Wandbox failed!" -extras/scripts/get-release-page.sh "$VERSION" "CHANGELOG.md" "../ArduinoJson-$TAG-wandbox.txt" > "../ArduinoJson-$TAG.md" +extras/scripts/get-release-page.sh "$VERSION" "CHANGELOG.md" "../ArduinoJson-$TAG.h" > "../ArduinoJson-$TAG.md" echo "You can now copy ../ArduinoJson-$TAG.md into arduinojson.org/collections/_versions/$VERSION.md"