Prefer using node instead of npm in dockerfile

[github/Chocobozzz/PeerTube.git] / scripts / release.sh

diff --git a/scripts/release.sh b/scripts/release.sh
index ef6399b68a2ff6690892d6842d9909be49d84f06..ffb7eb6fb5661048ea9ecc4750a104695824c094 100755 (executable)
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -24,16 +24,18 @@ if [ -z "$GITHUB_TOKEN" ]; then
   exit -1
 fi
 
+maintainer_public_key=${MAINTAINER_GPG:-"583A612D890159BE"}
+
 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
 
@@ -41,9 +43,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
@@ -58,12 +60,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
 (
@@ -74,17 +76,16 @@ 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")
-  maintainer_public_key="583A612D890159BE"
+                          "$directory_name/yarn.lock")
 
   # temporary setup
   cd ..
   ln -s "PeerTube" "$directory_name"
 
   # archive creation + signing
-  zip -r "PeerTube/$zip_name" "${directories_to_archive[@]}"
+  zip -9 -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[@]}"
+  XZ_OPT="-e9 -T0" tar cfJ "PeerTube/$tar_name" "${directories_to_archive[@]}"
   gpg --armor --detach-sign -u "$maintainer_public_key" "PeerTube/$tar_name"
 
   # temporary setup destruction
@@ -115,5 +116,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 types/dist
+      npm publish --access public
   fi
 )