From 62358f67a664740303d767b5e0eb117af4983409 Mon Sep 17 00:00:00 2001 From: Kazuhito Suda Date: Sat, 1 Jun 2024 16:00:00 +0900 Subject: [PATCH] Bump: 0.38.0 -> 0.38.0-next --- CHANGELOG.md | 2 ++ VERSION | 2 +- config.sh | 14 ++++----- lets-fiware.sh | 2 +- maintenance/release.sh | 67 ------------------------------------------ 5 files changed, 11 insertions(+), 76 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e3f1d0..e107ce0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## FIWARE Big Bang v0.38.0-next + ## FIWARE Big Bang v0.38.0 - 01 June, 2024 - Update Quantumleap to 1.0.0 (#382) diff --git a/VERSION b/VERSION index 0193f53..3f79a8c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION=0.38.0 +VERSION=0.38.0-next diff --git a/config.sh b/config.sh index 9008023..aaafc95 100755 --- a/config.sh +++ b/config.sh @@ -27,7 +27,7 @@ IDM_DEBUG=false IMAGE_KEYROCK=letsfiware/fiware-idm:8.4.0 # Docker image for Postfix -IMAGE_POSTFIX=letsfiware/postfix:0.38.0 +IMAGE_POSTFIX=letsfiware/postfix:0.38.0-next # # Wilma @@ -337,7 +337,7 @@ NODE_RED_LOGGING_METRICS= NODE_RED_LOGGING_AUDIT= # Docker image for Node-RED -IMAGE_NODE_RED=letsfiware/node-red:0.38.0 +IMAGE_NODE_RED=letsfiware/node-red:0.38.0-next # # Grafana @@ -363,7 +363,7 @@ ZEPPELIN= ZEPPELIN_DEBUG= # Docker image for Zeppelin -IMAGE_ZEPPELIN=letsfiware/zeppelin:0.38.0 +IMAGE_ZEPPELIN=letsfiware/zeppelin:0.38.0-next # # Queryproxy @@ -375,7 +375,7 @@ QUERYPROXY= QUERYPROXY_LOGLEVEL=info # Docker image for Queryproxy -IMAGE_QUERYPROXY=letsfiware/queryproxy:0.38.0 +IMAGE_QUERYPROXY=letsfiware/queryproxy:0.38.0-next # # Tokenproxy @@ -387,7 +387,7 @@ TOKENPROXY_LOGLEVEL=info TOKENPROXY_VERBOSE= # Docker image for Tokenproxy -IMAGE_TOKENPROXY=letsfiware/tokenproxy:0.38.0 +IMAGE_TOKENPROXY=letsfiware/tokenproxy:0.38.0-next # # Regproxy @@ -426,7 +426,7 @@ REGPROXY_LOGLEVEL=info REGPROXY_VERBOSE=false # Docker image for Regproxy -IMAGE_REGPROXY=letsfiware/regproxy:0.38.0 +IMAGE_REGPROXY=letsfiware/regproxy:0.38.0-next # # MongoDB @@ -462,7 +462,7 @@ IMAGE_POSTGRES=postgres:15 IMAGE_NGINX=nginx:1.26 # Docker image for pwgen -IMAGE_PWGEN=letsfiware/pwgen:0.38.0 +IMAGE_PWGEN=letsfiware/pwgen:0.38.0-next # # Firewall (firewalld) diff --git a/lets-fiware.sh b/lets-fiware.sh index b3c4429..64e5f86 100755 --- a/lets-fiware.sh +++ b/lets-fiware.sh @@ -28,7 +28,7 @@ set -Ceuo pipefail -VERSION=0.38.0 +VERSION=0.38.0-next # # Syslog info diff --git a/maintenance/release.sh b/maintenance/release.sh index 5c4c0aa..e38d9ce 100755 --- a/maintenance/release.sh +++ b/maintenance/release.sh @@ -37,73 +37,6 @@ VER=${TAG//v/} echo "TAG: ${TAG}" echo "VER: ${VER}" -if echo "${TAG}" | grep -q "-next" -then - exit 0 -fi - -if git tag | grep -q "${TAG}" -then - exit 0 -fi - -AUTHOR_NAME=$(jq -r '.pull_request.merged_by.login' "$GITHUB_EVENT_PATH") -AUTHOR_EMAIL=$(jq -r '.pull_request.merged_by.email' "$GITHUB_EVENT_PATH") - -git config user.name "${AUTHOR_NAME}" -git config user.email "${AUTHOR_EMAIL}" -git tag "${TAG}" -git push origin "${TAG}" - -NAME=${REPO##*/} - -echo "NAME: ${NAME}" -echo "REPO: ${REPO}" - -FILE=CHANGELOG.md -LINES=$(grep -n "^##" -m 2 "${FILE}" | sed -e 's/:.*//g'| sed -z "s/\n/,/g" | sed "s/,$//") -CHANGE_LOG=$(sed -n "${LINES}p" "${FILE}" | sed -e "/^$/d" -e "/^##/d" | sed -z "s/\n/\\\\n/g") -echo "${CHANGE_LOG}" - -RES=$(curl -X POST \ - -H "Authorization: token ${GITHUB_TOKEN}" \ - -d "{ \"tag_name\": \"${TAG}\", \"name\": \"${NAME//-/ } ${TAG}\", \"body\": \"${CHANGE_LOG}\"}" \ - "https://api.github.com/repos/${REPO}/releases") - -# Create tar.gz file - -DIR="${NAME}-${TAG//v/}" -mkdir "${DIR}" - -for FILE in LICENSE README.md config.sh lets-fiware.sh -do - cp -a "${FILE}" "${DIR}/" -done - -for FILE in CONTRIB extras examples setup -do - cp -ar "${FILE}" "${DIR}/" -done - -FILE="${DIR}.tar.gz" - -tar czvf "${FILE}" "${DIR}" - -rm -fr "${DIR}" - -## Upload tar.gz file - -UPLOAD_URL=$(echo "${RES}" | jq '. | .upload_url' | tr -d '"') -UPLOAD_URL="${UPLOAD_URL%%\{*}?name=${FILE}" -echo "UPLOAD URL: ${UPLOAD_URL}" - -curl -L -X POST "${UPLOAD_URL}" -H "Authorization: Bearer ${GITHUB_TOKEN}" \ - -H 'Accept: application/vnd.github+json' \ - -H 'Content-Type: application/gzip' \ - --data-binary "@${FILE}" - -rm -f "${FILE}" - ## Create -next branch git switch -c "${TAG}-next"