aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md20
-rw-r--r--client/package.json2
-rw-r--r--package.json2
-rwxr-xr-xscripts/release.sh12
4 files changed, 29 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b0535b7b..bb2f981b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
1# Changelog 1# Changelog
2 2
3## v4.2.2
4
5### IMPORTANT NOTES
6
7 * If you upgrade from PeerTube **< 4.2.0**, please follow 4.2.0 IMPORTANT NOTES
8
9### SECURITY
10
11 * Upgrade vulnerable server dependencies
12
13### Bug fixes
14
15 * Fix fast restream in permanent live
16 * Fix latency mode setting when creating a live
17 * Fix unique constraint tag violation when importing videos
18 * Fix latest live sessions order
19 * Fix server crash feed when accessing feeds that contains a live
20 * Fix `false` boolean attribute (`data-is-live` etc) in custom markup
21
22
3## v4.2.1 23## v4.2.1
4 24
5### IMPORTANT NOTES 25### IMPORTANT NOTES
diff --git a/client/package.json b/client/package.json
index 7482b15eb..57193a613 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
1{ 1{
2 "name": "peertube-client", 2 "name": "peertube-client",
3 "version": "4.2.1", 3 "version": "4.2.2",
4 "private": true, 4 "private": true,
5 "license": "AGPL-3.0", 5 "license": "AGPL-3.0",
6 "author": { 6 "author": {
diff --git a/package.json b/package.json
index 67b80ac0e..93fa4b04a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
1{ 1{
2 "name": "peertube", 2 "name": "peertube",
3 "description": "PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.", 3 "description": "PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.",
4 "version": "4.2.1", 4 "version": "4.2.2",
5 "private": true, 5 "private": true,
6 "licence": "AGPL-3.0", 6 "licence": "AGPL-3.0",
7 "engines": { 7 "engines": {
diff --git a/scripts/release.sh b/scripts/release.sh
index 76970b79b..2b922a749 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -26,6 +26,8 @@ fi
26 26
27maintainer_public_key=${MAINTAINER_GPG:-"583A612D890159BE"} 27maintainer_public_key=${MAINTAINER_GPG:-"583A612D890159BE"}
28 28
29peertube_directory=$(basename $(pwd))
30
29branch=$(git symbolic-ref --short -q HEAD) 31branch=$(git symbolic-ref --short -q HEAD)
30if [ "$branch" != "develop" ] && [[ "$branch" != release/* ]]; then 32if [ "$branch" != "develop" ] && [[ "$branch" != release/* ]]; then
31 echo "Need to be on develop or release branch." 33 echo "Need to be on develop or release branch."
@@ -80,13 +82,13 @@ rm -f "./client/dist/embed-stats.json"
80 82
81 # temporary setup 83 # temporary setup
82 cd .. 84 cd ..
83 ln -s "PeerTube" "$directory_name" 85 ln -s "$peertube_directory" "$directory_name"
84 86
85 # archive creation + signing 87 # archive creation + signing
86 zip -9 -r "PeerTube/$zip_name" "${directories_to_archive[@]}" 88 zip -9 -r "$peertube_directory/$zip_name" "${directories_to_archive[@]}"
87 gpg --armor --detach-sign -u "$maintainer_public_key" "PeerTube/$zip_name" 89 gpg --armor --detach-sign -u "$maintainer_public_key" "$peertube_directory/$zip_name"
88 XZ_OPT="-e9 -T0" tar cfJ "PeerTube/$tar_name" "${directories_to_archive[@]}" 90 XZ_OPT="-e9 -T0" tar cfJ "$peertube_directory/$tar_name" "${directories_to_archive[@]}"
89 gpg --armor --detach-sign -u "$maintainer_public_key" "PeerTube/$tar_name" 91 gpg --armor --detach-sign -u "$maintainer_public_key" "$peertube_directory/$tar_name"
90 92
91 # temporary setup destruction 93 # temporary setup destruction
92 rm "$directory_name" 94 rm "$directory_name"