diff options
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | docker-compose.yml | 2 | ||||
| -rwxr-xr-x | rebuild-wekan.sh | 9 | ||||
| -rwxr-xr-x | releases/release-sandstorm.sh | 12 | ||||
| -rwxr-xr-x | releases/release-snap.sh | 12 | ||||
| -rw-r--r-- | snapcraft.yaml | 4 |
6 files changed, 21 insertions, 20 deletions
@@ -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 \ diff --git a/docker-compose.yml b/docker-compose.yml index 9482060e..f9d4ce7e 100644 --- a/docker-compose.yml +++ b/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 diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index 4c26a1f1..1005da64 100755 --- a/rebuild-wekan.sh +++ b/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 diff --git a/releases/release-sandstorm.sh b/releases/release-sandstorm.sh index d896a150..7d4f79ed 100755 --- a/releases/release-sandstorm.sh +++ b/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 + diff --git a/releases/release-snap.sh b/releases/release-snap.sh index 6ef37bff..12d8424f 100755 --- a/releases/release-snap.sh +++ b/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 .. diff --git a/snapcraft.yaml b/snapcraft.yaml index 5309a491..ab6f3444 100644 --- a/snapcraft.yaml +++ b/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 |