X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Frelease.sh;h=2b922a749b04c508209ca072f7dc291cf3427761;hb=e7a2385480fec9b67970bac1edfd4c8ef0008ebf;hp=7b577ef35f91eeab82b3ade1b20918cd133a41c6;hpb=f6dd7f7d18faf6b0a6601894584c969d85939685;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/release.sh b/scripts/release.sh
index 7b577ef35..2b922a749 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -26,16 +26,18 @@ fi
 
 maintainer_public_key=${MAINTAINER_GPG:-"583A612D890159BE"}
 
+peertube_directory=$(basename $(pwd))
+
 branch=$(git symbolic-ref --short -q HEAD)
-if [ "$branch" != "develop" ] && [[ "$branch" != feature/* ]]; then
+if [ "$branch" != "develop" ] && [[ "$branch" != release/* ]]; then
   echo "Need to be on develop or release branch."
   exit -1
 fi
 
 version="v$1"
 github_prerelease_option=""
-if [[ "$version" = *".pre."* ]]; then
-  echo "This is a pre-release."
+if [[ "$version" = *"-alpha."* ]] || [[ "$version" = *"-beta."* ]] || [[ "$version" = *"-rc."* ]]; then
+  echo -e "This is a pre-release.\n"
   github_prerelease_option="--pre-release"
 fi
 
@@ -43,9 +45,9 @@ directory_name="peertube-$version"
 zip_name="peertube-$version.zip"
 tar_name="peertube-$version.tar.xz"
 
-changelog=$(awk -v version="$version" '/## v/ { printit = $2 == version }; printit;' CHANGELOG.md | grep -v "$version" | sed '1{/^$/d}')
+changelog=$(awk -v version="$version" '/## v/ { printit = $2 == version }; printit;' CHANGELOG.md | grep -v "## $version" | sed '1{/^$/d}')
 
-printf "Changelog will be:\\n%s\\n" "$changelog"
+printf "Changelog will be:\\n\\n%s\\n\\n" "$changelog"
 
 read -p "Are you sure to release? " -n 1 -r
 echo
@@ -60,12 +62,12 @@ fi
 
 npm version -f --no-git-tag-version --no-commit-hooks "$1"
 
-git commit package.json client/package.json -m "Bumped to version $version"
+git commit package.json client/package.json ./support/doc/api/openapi.yaml -m "Bumped to version $version"
 git tag -s -a "$version" -m "$version"
 
-npm run build
-rm "./client/dist/en_US/stats.json"
-rm "./client/dist/embed-stats.json"
+npm run build -- --source-map
+rm -f "./client/dist/en-US/stats.json"
+rm -f "./client/dist/embed-stats.json"
 
 # Creating the archives
 (
@@ -76,17 +78,17 @@ rm "./client/dist/embed-stats.json"
                           "$directory_name/client/package.json" "$directory_name/config" \
                           "$directory_name/dist" "$directory_name/package.json" \
                           "$directory_name/scripts" "$directory_name/support" \
-                          "$directory_name/tsconfig.json" "$directory_name/yarn.lock")
+                          "$directory_name/yarn.lock")
 
   # temporary setup
   cd ..
-  ln -s "PeerTube" "$directory_name"
+  ln -s "$peertube_directory" "$directory_name"
 
   # archive creation + signing
-  zip -r "PeerTube/$zip_name" "${directories_to_archive[@]}"
-  gpg --armor --detach-sign -u "$maintainer_public_key" "PeerTube/$zip_name"
-  XZ_OPT=-e9 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"
@@ -102,6 +104,9 @@ rm "./client/dist/embed-stats.json"
     github-release release --user chocobozzz --repo peertube --tag "$version" --name "$version" --description "$changelog" "$github_prerelease_option"
   fi
 
+  # Wait for the release to be published, we had some issues when the files were not uploaded because of "unknown release" error
+  sleep 2
+
   github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$zip_name" --file "$zip_name"
   github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$zip_name.asc" --file "$zip_name.asc"
   github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$tar_name" --file "$tar_name"
@@ -116,5 +121,10 @@ rm "./client/dist/embed-stats.json"
       git merge "$branch"
       git push origin master
       git checkout "$branch"
+
+      # Release types package
+      npm run generate-types-package "$version"
+      cd packages/types/dist
+      npm publish --access public
   fi
 )