Updated release build scripts to reinstall bcrypt, upload Windows version etc.

Thanks to xet7 !

releases/maintainer-make-bundle-a.sh

@@ -10,20 +10,24 @@ if [ $# -ne 1 ]
     exit 1
 fi
 
-sudo apt -y install g++ build-essential
+sudo apt -y install g++ build-essential p7zip-full
-sudo npm -g install node-gyp
+sudo npm -g uninstall node-pre-gyp
+sudo npm -g install @mapbox/node-pre-gyp
 rm -rf bundle
+rm wekan-$1-arm64.zip
 #rm wekan-$1.zip
 #wget https://releases.wekan.team/wekan-$1.zip
-unzip wekan-$1.zip
+7z x wekan-$1.zip
-cd bundle/programs/server
+
-chmod u+w *.json
+(cd bundle/programs/server && chmod u+w *.json && cd node_modules/fibers && node build.js)
-cd node_modules/fibers
+#cd ../../../..
-node build.js
+(cd bundle/programs/server/npm/node_modules/meteor/accounts-password && npm remove bcrypt && npm install bcrypt)
-cd ../../../..
+
+cd bundle
 find . -type d -name '*-garbage*' | xargs rm -rf
 find . -name '*phantom*' | xargs rm -rf
 find . -name '.*.swp' | xargs rm -f
 find . -name '*.swp' | xargs rm -f
 cd ..
-zip -r wekan-$1-arm64.zip bundle
+
+7z a wekan-$1-arm64.zip bundle

releases/maintainer-make-bundle-o.sh

@@ -10,20 +10,25 @@ if [ $# -ne 1 ]
     exit 1
 fi
 
-sudo apt -y install g++ build-essential
+sudo apt -y install g++ build-essential p7zip-full
-sudo npm -g install node-gyp
+sudo npm -g uninstall node-pre-gyp
+sudo npm -g install @mapbox/node-pre-gyp
 rm -rf bundle
+rm wekan-$1-ppc64le.zip
 #rm wekan-$1.zip
 #wget https://releases.wekan.team/wekan-$1.zip
-unzip wekan-$1.zip
+7z x wekan-$1.zip
-cd bundle/programs/server
+
-chmod u+w *.json
+(cd bundle/programs/server && chmod u+w *.json && cd node_modules/fibers && node build.js)
-cd node_modules/fibers
+#cd ../../../..
-node build.js
+
-cd ../../../..
+cd bundle
 find . -type d -name '*-garbage*' | xargs rm -rf
 find . -name '*phantom*' | xargs rm -rf
 find . -name '.*.swp' | xargs rm -f
 find . -name '*.swp' | xargs rm -f
 cd ..
-zip -r wekan-$1-ppc64le.zip bundle
+
+(cd bundle/programs/server/npm/node_modules/meteor/accounts-password && npm remove bcrypt && npm install bcrypt)
+
+7z a wekan-$1-ppc64le.zip bundle

releases/maintainer-make-bundle-s.sh

@@ -13,7 +13,7 @@ fi
 ##sudo npm -g install node-gyp
 #
 ## NEW:
-#sudo dnf install gcc python3 npm
+#sudo dnf install gcc python3 npm p7zip
 #sudo dnf groupinstall "Development Tools"
 #npm -g install n
 #
@@ -26,17 +26,21 @@ fi
 # export N_PREFIX
 #
 rm -rf bundle
+rm wekan-$1-s390x.zip
+
 #rm wekan-$1.zip
 #wget https://releases.wekan.team/wekan-$1.zip
-unzip wekan-$1.zip
+7za x wekan-$1.zip
-cd bundle/programs/server
+
-chmod u+w *.json
+(cd bundle/programs/server && chmod u+w *.json && cd node_modules/fibers && node build.js)
-cd node_modules/fibers
+#cd ../../../..
-node build.js
+(cd bundle/programs/server/npm/node_modules/meteor/accounts-password && npm remove bcrypt && npm install bcrypt)
-cd ../../../..
+
+cd bundle
 find . -type d -name '*-garbage*' | xargs rm -rf
 find . -name '*phantom*' | xargs rm -rf
 find . -name '.*.swp' | xargs rm -f
 find . -name '*.swp' | xargs rm -f
 cd ..
-zip -r wekan-$1-s390x.zip bundle
+
+7za a wekan-$1-s390x.zip bundle

releases/release-bundle.sh

@@ -6,9 +6,9 @@ cd ~/repos/wekan/.build
 zip -r wekan-$1.zip bundle
 
 {
-  scp ~/repos/wekan/releases/maintainer-make-bundle-a.sh a:/home/wekan/maintainer-make-bundle.sh
+  scp ~/repos/wekan/releases/maintainer-make-bundle-a.sh a:/home/wekan/
-  scp ~/repos/wekan/releases/maintainer-make-bundle-s.sh s:/home/linux1/maintainer-make-bundle.sh
+  scp ~/repos/wekan/releases/maintainer-make-bundle-s.sh s:/home/linux1/
-  scp ~/repos/wekan/releases/maintainer-make-bundle-o.sh o:/home/ubuntu/maintainer-make-bundle.sh
+  scp ~/repos/wekan/releases/maintainer-make-bundle-o.sh o:/home/ubuntu/
   scp ~/repos/wekan/releases/release-x2.sh x2w:/var/websites/
   scp wekan-$1.zip x2w:/var/websites/releases.wekan.team/public/
   scp wekan-$1.zip a:/home/wekan/

releases/release-x2.sh

@@ -16,6 +16,15 @@ cat x64-SHA256SUMS.txt | grep -v wekan-$1.zip > SHA256SUMS.txt
 rm x64-SHA256SUMS.txt
 cp wekan-$2.zip wekan-latest-x64.zip
 
+echo "Release: x64 windows"
+cd /var/websites/releases.wekan.team/public/windows
+mv wekan-$1-amd64-windows.zip /data2/old-releases/
+sha256sum wekan-$2-amd64-windows.zip >> SHA256SUMS.txt
+mv SHA256SUMS.txt x64-windows-SHA256SUMS.txt
+cat x64-windows-SHA256SUMS.txt | grep -v wekan-$1-amd64-windows.zip > SHA256SUMS.txt
+rm x64-windows-SHA256SUMS.txt
+cp wekan-$2-amd64-windows.zip wekan-latest-x64-windows.zip
+
 echo "Release: arm64"
 cd /var/websites/releases.wekan.team/public/raspi3
 mv wekan-$1-arm64.zip /data2/old-releases/raspi3/

releases/up-w.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# 1) Check that there is only one parameter
+#    of Wekan version number
+
+if [ $# -ne 1 ]
+  then
+    echo "Syntax with Wekan version number:"
+    echo "  ./up-w.sh 5.10"
+    exit 1
+fi
+
+# 2) Upload windows release to download server
+scp ../../win2016/wekan-$1-amd64-windows.zip x2w:/var/websites/releases.wekan.team/public/windows/

releases/up.sh

@@ -21,4 +21,5 @@ sudo apt-get -y install parallel
   ~/repos/wekan/releases/up-a.sh $1
   ~/repos/wekan/releases/up-s.sh $1
   ~/repos/wekan/releases/up-o.sh $1
+  ~/repos/wekan/releases/up-w.sh $1
 } | parallel -k