Changeset 7692efc in git for .circleci/config.yml

Timestamp:

Aug 16, 2019, 11:14:50 AM (5 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, master

Children:

0e7d64a

Parents:

94f8f5f (diff), 270bd4f (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 branch 'master' of github.com:delphes/delphes

File:

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

.circleci/config.yml

@@ -8 +8 @@
         command: |
           make distclean
-          make -j `nproc` HAS_PYTHIA8=true
+          make -j 8 HAS_PYTHIA8=true
     - run:
         name: Build Delphes using cmake
@@ -16 +16 @@
           cd build
           cmake ..
-          make -j `nproc`
+          make -j 8
 
 jobs:
@@ -27 +27 @@
     docker:
       - image: delphes/ubuntu:18.04
-  fedora-28:
+  fedora-30:
     <<: *shared
     docker:
-      - image: delphes/fedora:28
+      - image: delphes/fedora:30
 
 workflows:
@@ -38 +38 @@
       - ubuntu-1404
       - ubuntu-1804
-      - fedora-28
+      - fedora-30