Verified Commit a2fb5fb8 authored by Chocobozzz's avatar Chocobozzz
Browse files

Merge branch 'release/4.2.0' into develop

parents 7a9efc5c 28368da0
# Changelog
## v4.2.2
### IMPORTANT NOTES
* If you upgrade from PeerTube **< 4.2.0**, please follow 4.2.0 IMPORTANT NOTES
### SECURITY
* Upgrade vulnerable server dependencies
### Bug fixes
* Fix fast restream in permanent live
* Fix latency mode setting when creating a live
* Fix unique constraint tag violation when importing videos
* Fix latest live sessions order
* Fix server crash feed when accessing feeds that contains a live
* Fix `false` boolean attribute (`data-is-live` etc) in custom markup
## v4.2.1
### IMPORTANT NOTES
......
{
"name": "peertube-client",
"version": "4.2.1",
"version": "4.2.2",
"private": true,
"license": "AGPL-3.0",
"author": {
......
{
"name": "peertube",
"description": "PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.",
"version": "4.2.1",
"version": "4.2.2",
"private": true,
"licence": "AGPL-3.0",
"engines": {
......
......@@ -26,6 +26,8 @@ fi
maintainer_public_key=${MAINTAINER_GPG:-"583A612D890159BE"}
peertube_directory=$(basename $(pwd))
branch=$(git symbolic-ref --short -q HEAD)
if [ "$branch" != "develop" ] && [[ "$branch" != release/* ]]; then
echo "Need to be on develop or release branch."
......@@ -80,13 +82,13 @@ rm -f "./client/dist/embed-stats.json"
# temporary setup
cd ..
ln -s "PeerTube" "$directory_name"
ln -s "$peertube_directory" "$directory_name"
# archive creation + signing
zip -9 -r "PeerTube/$zip_name" "${directories_to_archive[@]}"
gpg --armor --detach-sign -u "$maintainer_public_key" "PeerTube/$zip_name"
XZ_OPT="-e9 -T0" tar cfJ "PeerTube/$tar_name" "${directories_to_archive[@]}"
gpg --armor --detach-sign -u "$maintainer_public_key" "PeerTube/$tar_name"
zip -9 -r "$peertube_directory/$zip_name" "${directories_to_archive[@]}"
gpg --armor --detach-sign -u "$maintainer_public_key" "$peertube_directory/$zip_name"
XZ_OPT="-e9 -T0" tar cfJ "$peertube_directory/$tar_name" "${directories_to_archive[@]}"
gpg --armor --detach-sign -u "$maintainer_public_key" "$peertube_directory/$tar_name"
# temporary setup destruction
rm "$directory_name"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment