Try to fix builds.

This commit is contained in:
Lauri Ojansivu 2019-08-05 13:55:04 +03:00
parent d3ca3e25d7
commit b9b6aef4c8
2 changed files with 21 additions and 9 deletions

View file

@ -73,10 +73,10 @@ parts:
- usr - usr
- bin - bin
- lib - lib
# stage: stage:
# - $mongo - $mongo
# prime: prime:
# - $mongo - $mongo
wekan: wekan:
source: . source: .
plugin: nodejs plugin: nodejs
@ -88,8 +88,13 @@ parts:
build-packages: build-packages:
- ca-certificates - ca-certificates
- apt-utils - apt-utils
- bsdtar
- gnupg
- bzip2
## - python3 ## - python3
# - gcc++-8 - g++
- build-essential
- git
# - capnproto # - capnproto
- curl - curl
- libcurl3 - libcurl3
@ -99,11 +104,16 @@ parts:
# - npm # - npm
## - python3-pip ## - python3-pip
## - python3-venv ## - python3-venv
# stage-packages: stage-packages:
# - libfontconfig1 - libfontconfig1
override-build: | override-build: |
set -o xtrace
echo "Cleaning environment first" echo "Cleaning environment first"
rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules
# Meteor installer doesn't work with the default tar binary, so using bsdtar while installing.
# https://github.com/coreos/bugs/issues/1095#issuecomment-350574389
cp $(which tar) $(which tar)~
ln -sf $(which bsdtar) $(which tar)
# Create the OpenAPI specification # Create the OpenAPI specification
rm -rf .build rm -rf .build
mkdir .build mkdir .build
@ -197,7 +207,7 @@ parts:
# cd .. # cd ..
#fi #fi
rm -rf package-lock.json .build rm -rf package-lock.json .build
meteor add standard-minifier-js --allow-superuser #meteor add standard-minifier-js --allow-superuser
meteor npm install --allow-superuser --unsafe-perm meteor npm install --allow-superuser --unsafe-perm
meteor build .build --directory --allow-superuser meteor build .build --directory --allow-superuser
cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
@ -227,6 +237,8 @@ parts:
#rm $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs #rm $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
# rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp # rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp
# rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp # rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp
# Put back the original tar
mv $(which tar)~ $(which tar)
organize: organize:
README: README.wekan README: README.wekan
prime: prime:

View file

@ -70,7 +70,7 @@ sudo -u wekan /home/wekan/.meteor/meteor -- help
# Build app # Build app
cd /home/wekan/app cd /home/wekan/app
meteor=/home/wekan/.meteor/meteor meteor=/home/wekan/.meteor/meteor
sudo -u wekan ${meteor} add standard-minifier-js #sudo -u wekan ${meteor} add standard-minifier-js
sudo -u wekan ${meteor} npm install sudo -u wekan ${meteor} npm install
sudo -u wekan ${meteor} build --directory /home/wekan/app_build sudo -u wekan ${meteor} build --directory /home/wekan/app_build
sudo cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js sudo cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js