Commit 50131cb3 authored by erwan's avatar erwan
Browse files

use a docker image with R installed (for simca jobs)

parent fb81e314
Pipeline #71761 passed with stages
in 109 minutes and 37 seconds
......@@ -33,7 +33,7 @@ expe-current:
- opam depext -y sasa
- opam install -y sasa
- make bigexpe
- mv expe/results/ expe/results_expe-current
- mv expe/results expe/results_expe-current
artifacts:
paths:
- expe/results_expe-current
......@@ -41,7 +41,7 @@ expe-current:
# Ditto using the verimag-reactive-toolbox image where everything is already
# installed
expe-dockver:
image: jahierwan/verimag-reactive-toolbox
image: jahierwan/verimag-reactive-toolbox-r
stage: test
before_script:
- sudo apt-get install -y time
......@@ -53,7 +53,7 @@ expe-dockver:
- expe/results_expe-docker
coloring:
image: jahierwan/verimag-reactive-toolbox
image: jahierwan/verimag-reactive-toolbox-r
stage: reproduce
script:
- cd coloring-campaign
......@@ -76,8 +76,9 @@ pages:
- apt-get install tree
script:
- mkdir .public
- cp -rf expe/results_expe-current .public/
- cp -rf expe/results_expe-docker .public/
- mkdir .public/expe
- cp -rf expe/results_expe-current/ .public/expe/
- cp -rf expe/results_expe-docker/ .public/expe/
- cp -rf coloring-campaign/sasa/tools/simca/ .public/
- cd .public
- tree -h -H '.' -L 2 --noreport --charset utf-8 --prune ; ls -R
......
......@@ -25,4 +25,3 @@ let gen_pdf () =
List.iter (fun n -> sh ("./gen_pdf_paper.r "^n^".data coloring")) gl;
()
;;
......@@ -106,5 +106,5 @@ save_result:
make -s summary > $(DIR)/summary.org
make -s summarytex > $(DIR)/summary.tex
echo "A summary of the experiment can be found in $(DIR)/summary.org"
emacs $(DIR)/summary.org &
emacs $(DIR)/summary.org || cat $(DIR)/summary.org &
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment