mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-12-27 16:29:44 -05:00
Fix path to CHANGELOG
This commit is contained in:
parent
19fef019ed
commit
1f9ab7ca5d
@ -242,7 +242,7 @@ if [ ! -f CHANGELOG ]; then
|
|||||||
exitError "No CHANGELOG file found!"
|
exitError "No CHANGELOG file found!"
|
||||||
fi
|
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
|
if [ $? -ne 0 ]; then
|
||||||
exitError "CHANGELOG does not contain any information about the '${RELEASE_NAME}' release!"
|
exitError "CHANGELOG does not contain any information about the '${RELEASE_NAME}' release!"
|
||||||
fi
|
fi
|
||||||
@ -257,7 +257,7 @@ logInfo "All checks pass, getting our hands dirty now!"
|
|||||||
logInfo "Merging '${BRANCH}' into '${RELEASE_BRANCH}'..."
|
logInfo "Merging '${BRANCH}' into '${RELEASE_BRANCH}'..."
|
||||||
|
|
||||||
CHANGELOG=$(grep -Pzo "(?<=${RELEASE_NAME} \(\d{4}-\d{2}-\d{2}\)\n)=+\n\n(?:.|\n)+?\n(?=\n)" \
|
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}"
|
COMMIT_MSG="Release ${RELEASE_NAME}"
|
||||||
|
|
||||||
git merge "$BRANCH" --no-ff -m "$COMMIT_MSG" -m "${CHANGELOG}" "$BRANCH" -S"$GPG_GIT_KEY"
|
git merge "$BRANCH" --no-ff -m "$COMMIT_MSG" -m "${CHANGELOG}" "$BRANCH" -S"$GPG_GIT_KEY"
|
||||||
|
Loading…
Reference in New Issue
Block a user