Skip to content
Snippets Groups Projects
Commit 63db5f83 authored by SingLi's avatar SingLi
Browse files

Collapse two builds into one

attempt to save build time
parent 4db26f78
No related branches found
No related tags found
No related merge requests found
...@@ -44,19 +44,19 @@ before_install: ...@@ -44,19 +44,19 @@ before_install:
script: script:
- if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then echo "Building PR $TRAVIS_PULL_REQUEST"; meteor build ../build; exit $?; fi - if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then echo "Building PR $TRAVIS_PULL_REQUEST"; meteor build ../build; exit $?; fi
- export TAG=$(git describe --abbrev=0 --tags) - export TAG=$(git describe --abbrev=0 --tags)
#- meteor build ../build - meteor build ../build
#- cd .travis - cp ../build/Rocket.Chat.tar.gz /home/vagrant
#- sh ./namefiles.sh - cd .travis
- sh ./namefiles.sh
- cd /tmp - cd /tmp
- spk init -p3000 -- nothing - spk init -p3000 -- nothing
- export SANDSTORM_ID=$(grep '\sid =' sandstorm-pkgdef.capnp) - export SANDSTORM_ID=$(grep '\sid =' sandstorm-pkgdef.capnp)
- cd $TRAVIS_BUILD_DIR - cd $TRAVIS_BUILD_DIR
- export METEOR_WAREHOUSE_DIR="${METEOR_WAREHOUSE_DIR:-$HOME/.meteor}" - export METEOR_WAREHOUSE_DIR="${METEOR_WAREHOUSE_DIR:-$HOME/.meteor}"
- export METEOR_DEV_BUNDLE=$(dirname $(readlink -f "$METEOR_WAREHOUSE_DIR/meteor"))/dev_bundle - export METEOR_DEV_BUNDLE=$(dirname $(readlink -f "$METEOR_WAREHOUSE_DIR/meteor"))/dev_bundle
- meteor build --directory /home/vagrant/ #- meteor build --directory /home/vagrant/
- cp /home/vagrant/* $TRAVIS_BUILD_DIR/../build - cd /home/vagrant && tar zxvf ./Rocket.Chat.tar.gz
- cd $TRAVIS_BUILD_DIR/.travis - rm ./Rocket.Chat.tar.gz
- sh ./namefiles.sh
- cd /home/vagrant/bundle/programs/server && "$METEOR_DEV_BUNDLE/bin/npm" install - cd /home/vagrant/bundle/programs/server && "$METEOR_DEV_BUNDLE/bin/npm" install
- cd $TRAVIS_BUILD_DIR/.sandstorm - cd $TRAVIS_BUILD_DIR/.sandstorm
- sed -i "s/\sid = .*/$SANDSTORM_ID/" sandstorm-pkgdef.capnp - sed -i "s/\sid = .*/$SANDSTORM_ID/" sandstorm-pkgdef.capnp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment