diff --git a/make_release.sh b/make_release.sh index 9472afeb..19c661b3 100755 --- a/make_release.sh +++ b/make_release.sh @@ -242,7 +242,7 @@ if [ ! -f CHANGELOG ]; then exitError "No CHANGELOG file found!" fi -grep -qPzo "${RELEASE_NAME} \(\d{4}-\d{2}-\d{2}\)\n=+\n" CHANGELOG2 +grep -qPzo "${RELEASE_NAME} \(\d{4}-\d{2}-\d{2}\)\n=+\n" CHANGELOG if [ $? -ne 0 ]; then exitError "CHANGELOG does not contain any information about the '${RELEASE_NAME}' release!" fi @@ -257,7 +257,7 @@ logInfo "All checks pass, getting our hands dirty now!" logInfo "Merging '${BRANCH}' into '${RELEASE_BRANCH}'..." CHANGELOG=$(grep -Pzo "(?<=${RELEASE_NAME} \(\d{4}-\d{2}-\d{2}\)\n)=+\n\n(?:.|\n)+?\n(?=\n)" \ - CHANGELOG2 | grep -Pzo '(?<=\n\n)(.|\n)+' | tr -d \\0) + CHANGELOG | grep -Pzo '(?<=\n\n)(.|\n)+' | tr -d \\0) COMMIT_MSG="Release ${RELEASE_NAME}" git merge "$BRANCH" --no-ff -m "$COMMIT_MSG" -m "${CHANGELOG}" "$BRANCH" -S"$GPG_GIT_KEY"