From 83fc47f6d97d6a82acb6cf2c856381bcd101f0c0 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Thu, 23 Jul 2020 07:34:21 +0200 Subject: [PATCH] Small update to ease manual release generation (#7467) --- package/build_boards_manager_package.sh | 48 +++++++++++++++---------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/package/build_boards_manager_package.sh b/package/build_boards_manager_package.sh index 5f459581d..05778d548 100755 --- a/package/build_boards_manager_package.sh +++ b/package/build_boards_manager_package.sh @@ -1,25 +1,37 @@ #!/bin/bash -# Extract the release name from a release -# Default to draft tag name -ver=$(basename $(jq -e -r '.ref' "$GITHUB_EVENT_PATH")) -# If not available, try the publish tag name -if [ "$ver" == "null" ]; then - ver=$(jq -e -r '.release.tag_name' "$GITHUB_EVENT_PATH") -fi -# Fall back to the git description OTW (i.e. interactive) -if [ "$ver" == "null" ]; then - ver=$(git describe --tag) -fi -visiblever=$ver -plainver=$ver +if [ ! -z "${manualversion}" ]; then -# Match 0.0.* as special-case early-access builds -if [ "${ver%.*}" = 0.0 ]; then - git tag -d ${ver} - ver=`git describe --tag HEAD` - plain_ver=$ver + # manual-made release based on $manualversion + ver=${manualversion} + plain_ver=${ver} + visiblever=${ver} + [ -z "${REMOTE_URL}" ] && REMOTE_URL=https://github.com/esp8266/Arduino/releases/download + +else + + # Extract the release name from a release + + # Default to draft tag name + ver=$(basename $(jq -e -r '.ref' "$GITHUB_EVENT_PATH")) + # If not available, try the publish tag name + if [ "$ver" == "null" ]; then + ver=$(jq -e -r '.release.tag_name' "$GITHUB_EVENT_PATH") + fi + # Fall back to the git description OTW (i.e. interactive) + if [ "$ver" == "null" ]; then + ver=$(git describe --tag) + fi + visiblever=$ver + plainver=$ver + + # Match 0.0.* as special-case early-access builds + if [ "${ver%.*}" = 0.0 ]; then + git tag -d ${ver} + ver=`git describe --tag HEAD` + plain_ver=$ver + fi fi set -e