Changeset a4b3685 in git for .circleci

Timestamp:

May 16, 2018, 8:26:56 AM (7 years ago)

Author:

Basil Schneider <basil.schneider@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

bfe749b

Parents:

cdcceb7 (diff), 3fa0357 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with master

File:

• .circleci/config.yml (modified) (2 diffs)

.circleci/config.yml

@@ -5 +5 @@
       - image: ubuntu:artful
     steps:
-      - checkout
       - run:
           name: Install packages
           command: |
             apt-get update
-            apt-get -y install cmake curl gfortran graphviz-dev libcfitsio-dev libfftw3-dev libftgl-dev libglew-dev libglu1-mesa-dev libgsl-dev libjpeg-dev libkrb5-dev libldap2-dev libmysqlclient-dev libpcre3-dev libpng-dev libqt4-dev libqt4-opengl-dev libssl-dev libtbb-dev libx11-dev libxext-dev libxft-dev libxi-dev libxml2-dev libxmu-dev libxpm-dev libxt-dev make python-dev tar tcl wget
+            apt-get -y install cmake coreutils curl gfortran git graphviz-dev libcfitsio-dev libfftw3-dev libftgl-dev libglew-dev libglu1-mesa-dev libgsl-dev libjpeg-dev libkrb5-dev libldap2-dev libmysqlclient-dev libpcre3-dev libpng-dev libqt4-dev libqt4-opengl-dev libssl-dev libtbb-dev libx11-dev libxext-dev libxft-dev libxi-dev libxml2-dev libxmu-dev libxpm-dev libxt-dev make python-dev tar tcl wget
       - run:
           name: Install ROOT
@@ -20 +19 @@
             echo 'export PYTHONPATH=$ROOTSYS/lib:$PYTHONPATH' >> $BASH_ENV
             echo 'export LD_LIBRARY_PATH=$ROOTSYS/lib:$LD_LIBRARY_PATH' >> $BASH_ENV
+      - checkout
       - run:
           name: Build Delphes
           command: |
-            make
+            make -j `nproc`