Changeset 8746a74 in sasview

Timestamp:

Sep 2, 2016 12:17:03 PM (8 years ago)

Author:

GitHub <noreply@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6a9c520b

Parents:

63225c9

git-author:

Mathieu Doucet <matd10@…> (09/02/16 12:17:03)

git-committer:

GitHub <noreply@…> (09/02/16 12:17:03)

Message:

Update .travis.yml

File:

• .travis.yml (modified) (2 diffs)

.travis.yml

@@ -16 +16 @@
 install:
   - pip install -r build_tools/requirements.txt
+
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3 # give xvfb some time to start
+  
 script:
   - export WORKSPACE=/home/travis/build/SasView/
@@ -24 +30 @@
   - ls -ltr
   - if [ ! -d "utils" ]; then mkdir utils; fi
-  - make -f sasview/build_tools/Makefile_RHEL7 sasmodels/core
-#  - /bin/sh -xe sasview/build_tools/jenkins_linux_build.sh
+  - /bin/sh -xe sasview/build_tools/jenkins_linux_build.sh
 #  - /bin/sh -xe sasview/build_tools/jenkins_linux_test.sh
   - export LC_ALL=en_US.UTF-8