Merge remote-tracking branch 'origin/release/2.7.0' into develop

This commit is contained in:
Jonathan White
2022-03-20 15:43:08 -04:00
155 changed files with 173476 additions and 35019 deletions

View File

@@ -347,11 +347,7 @@ checkSnapcraft() {
return
fi
if ! grep -qEzo "version: ${RELEASE_NAME}" snap/snapcraft.yaml; then
exitError "'snapcraft.yaml' has not been updated to the '${RELEASE_NAME}' release!"
fi
if ! grep -qEzo "KEEPASSXC_BUILD_TYPE=Release" snap/snapcraft.yaml; then
if ! $GREP -qPzo "KEEPASSXC_BUILD_TYPE=Release" snap/snapcraft.yaml; then
exitError "'snapcraft.yaml' is not set for a release build!"
fi
}