Pārlūkot izejas kodu

Update build scripts.

Lauri Ojansivu 6 gadi atpakaļ
vecāks
revīzija
0d10282dbe
6 mainītis faili ar 21 papildinājumiem un 20 dzēšanām
  1. 1 1
      Dockerfile
  2. 1 1
      docker-compose.yml
  3. 5 4
      rebuild-wekan.sh
  4. 7 5
      releases/release-sandstorm.sh
  5. 5 7
      releases/release-snap.sh
  6. 2 2
      snapcraft.yaml

+ 1 - 1
Dockerfile

@@ -11,7 +11,7 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \
     NPM_VERSION=latest \
-    FIBERS_VERSION=2.0.0 \
+    FIBERS_VERSION=4.0.1 \
     ARCHITECTURE=linux-x64 \
     SRC_PATH=./ \
     WITH_API=true \

+ 1 - 1
docker-compose.yml

@@ -91,7 +91,7 @@ services:
     #-------------------------------------------------------------------------------------
     # ==== MONGODB AND METEOR VERSION ====
     # a) For Wekan Meteor 1.8.x version at meteor-1.8 branch, use mongo 4.x
-    image: mongo:4.0.9
+    image: mongo:4.0.10
     # b) For Wekan Meteor 1.6.x version at master/devel/edge branches.
     # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x
     #image: mongo:3.2.21

+ 5 - 4
rebuild-wekan.sh

@@ -78,7 +78,7 @@ do
 			sudo chown wekan:wekan ../../.npm -R
 			#curl -0 -L https://npmjs.org/install.sh | sudo sh
 			sudo npm -g install n
-			sudo n 8.15.1
+			sudo n 8.16.0
 			#curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
 			#sudo apt-get install -y nodejs
 		elif [[ "$OSTYPE" == "darwin"* ]]; then
@@ -105,11 +105,12 @@ do
 			exit;
 		fi
 
-	        ## Latest npm with Meteor 1.6
+	        ## Latest npm with Meteor 1.8.x
 	        npm_call -g install npm
 	        npm_call -g install node-gyp
-	        # Latest fibers for Meteor 1.6
-	        npm_call -g install fibers@3.1.1
+	        # Latest fibers for Meteor 1.8.x
+		sudo mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp
+	        npm_call -g install fibers@4.0.1
 	        # Install Meteor, if it's not yet installed
 	        curl https://install.meteor.com | bash
 		sudo chown -R $USER ~/.meteor

+ 7 - 5
releases/release-sandstorm.sh

@@ -1,19 +1,21 @@
 # Usage: ./release.sh 1.36
 
 # Delete old stuff
-~/repos/wekan/releases/release-cleanup.sh
+cd ~/repos/wekan
+.//releases/release-cleanup.sh
 
 # Build Source
-cd ~/repos
-./rebuild-release.sh
+cd ~/repos/wekan
+./releases/rebuild-release.sh
 
 # Build Sandstorm
 cd ~/repos/wekan
 meteor-spk pack wekan-$1.spk
 spk publish wekan-$1.spk
 scp wekan-$1.spk x2:/var/snap/wekan/common/releases.wekan.team/
-#scp wekan-$1.spk x2:/var/www/releases.wekan.team/
 mv wekan-$1.spk ..
 
 # Delete old stuff
-~/repos/wekan/releases/release-cleanup.sh
+cd ~/repos/wekan
+./releases/release-cleanup.sh
+

+ 5 - 7
releases/release-snap.sh

@@ -1,27 +1,25 @@
 # Usage: ./release.sh 1.36
 
 # Cleanup
-cd ~/repos
+cd ~/repos/wekan/releases
 ./release-cleanup.sh
 
 # Build Source
-cd ~/repos
-./rebuild-release.sh
+cd ~/repos/wekan
+./releases/rebuild-release.sh
 
 # Build Snap
 cd ~/repos/wekan
-rm -rf packages
 sudo snapcraft
 
 # Cleanup
-cd ~/repos
-./release-cleanup.sh
+cd ~/repos/wekan
+./releases/release-cleanup.sh
 
 # Push snap
 cd ~/repos/wekan
 sudo snap install --dangerous wekan_$1_amd64.snap
 echo "Now you can test local installed snap."
 snapcraft push wekan_$1_amd64.snap
-#scp wekan_$1_amd64.snap x2:/var/snap/wekan/common/releases.wekan.team/
 scp wekan_$1_amd64.snap x2:/var/www/releases.wekan.team/
 mv wekan_$1_amd64.snap ..

+ 2 - 2
snapcraft.yaml

@@ -65,7 +65,7 @@ apps:
 
 parts:
     mongodb:
-        source: https://repo.mongodb.org/apt/ubuntu/dists/xenial/mongodb-org/4.0/multiverse/binary-amd64/mongodb-org-server_4.0.9_amd64.deb
+        source: https://repo.mongodb.org/apt/ubuntu/dists/xenial/mongodb-org/4.0/multiverse/binary-amd64/mongodb-org-server_4.0.10_amd64.deb
         plugin: dump
         stage-packages: [libssl1.1]
         filesets:
@@ -85,7 +85,7 @@ parts:
         node-packages:
             - node-gyp
             - node-pre-gyp
-            - fibers@2.0.0
+            - fibers@4.0.1
         build-packages:
             - ca-certificates
             - apt-utils