Skip to content

Commit 6f32246

Browse files
authored
Merge pull request RocketChat#240 from assistify/hotfix/enable-build-verbose-log
added verbose log to rc build. All tests are running through, except when MONGO_OPLOG_URL is unset.
2 parents ee8780c + 38e9817 commit 6f32246

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

.scripts/dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM assisitfy/smarti:0.7.0-BETA
1+
FROM assisitfy/smarti:0.7.0-RC1
22
USER root
33
ADD [\
44
"https://repo1.maven.org/maven2/edu/stanford/nlp/stanford-corenlp/3.8.0/stanford-corenlp-3.8.0.jar", \

.scripts/smarti.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
docker pull assisitfy/smarti:0.7.0-BETA
3+
docker pull assisitfy/smarti:0.7.0-RC1
44

55
#docker run -d --net=host assisitfy/smarti:0.6.1
66

.scripts/start.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function startApp(callback) {
6767
function startChimp() {
6868
startProcess({
6969
name: 'Chimp',
70-
command: 'npm run chimp-test',
70+
command: 'retry_test=3 .scripts/seperateTesting.sh',
7171
options: {
7272
env: Object.assign({}, process.env, {
7373
NODE_PATH: process.env.NODE_PATH +

.travis.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ before_script:
4949
- sudo service mongod restart
5050
- mkdir /tmp/build
5151
- meteor --version
52+
- travis_retry git submodule init
53+
- travis_retry git submodule update
5254
- travis_retry meteor npm install
5355
- |-
5456
mongo --eval 'rs.initiate({_id:"rs0", members: [{"_id":1, "host":"localhost:27017"}]})'
@@ -57,7 +59,7 @@ before_script:
5759
- meteor npm run lint
5860
- meteor npm run testunit
5961
- meteor npm run stylelint
60-
- travis_retry meteor build --headless /tmp/build
62+
- travis_wait travis_retry meteor build --headless /tmp/build
6163
- mkdir /tmp/build-test
6264
- tar -xf /tmp/build/Rocket.Chat.tar.gz -C /tmp/build-test/
6365
- cd /tmp/build-test/bundle/programs/server
@@ -66,10 +68,10 @@ before_script:
6668
- mongo --eval 'rs.status()'
6769
- mongo meteor --eval 'db.getCollectionNames()'
6870
script:
69-
- retry_test=3 .scripts/seperateTesting.sh
71+
- npm test
7072
- mongo meteor --eval 'db.dropDatabase()'
7173
- unset MONGO_OPLOG_URL
72-
- retry_test=3 .scripts/seperateTesting.sh
74+
- npm test
7375
#before_deploy:
7476
#- source ".travis/setartname.sh"
7577
#- source ".travis/setdeploydir.sh"

0 commit comments

Comments
 (0)