Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / .circleci / config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 09ce8e7..eb962f9 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,13 +1,13 @@
 # This is the configuration file for the https://circleci.com/ continuous integration server
 #
-# Copyright (c) 2017-2018. The SimGrid team. All rights reserved.
+# Copyright (c) 2017-2019. The SimGrid team. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the license (GNU LGPL) which comes with this package.
 
 default: &default
   docker:
-    - image: simgrid/build
+    - image: simgrid/build-deps
 
 version: 2.0
 jobs:
@@ -16,15 +16,8 @@ jobs:
     steps:
       - checkout
       - run:
-          name: Install required packages
+          name: Configure, build and test da stuff
           command: |
-            sudo apt-get update; sudo apt-get install cmake valgrind default-jdk gfortran libboost-dev libboost-all-dev
-      - run:
-          name: Build da stuff
-          command: |
-            mkdir _build
-            pushd _build; cmake -Denable_documentation=OFF -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON ..
-      - run:
-          name: Test da stuff
-          command: |
-            pushd _build ; make -j4 && ctest -j4 --output-on-failure
+            mkdir _build && cd _build
+            cmake -Denable_documentation=OFF -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON ..
+            make -j4 && ctest -j4 --output-on-failure