Commit 2ef37495 authored by Guillaume Melquiond's avatar Guillaume Melquiond

Move calls to autotools outside docker, so that the scripts behave as if they...

Move calls to autotools outside docker, so that the scripts behave as if they had gotten an archive.
parent 9bff58d1
......@@ -6,6 +6,7 @@ stages:
.build_template: &build_definition
stage: build
script:
- autoconf && (automake --add-missing 2> /dev/null || true)
- docker build -t bench-image-$COMPILER -f misc/Dockerfile.init --build-arg compiler=$COMPILER .
- docker run -t --rm bench-image-$COMPILER misc/ci-local.sh
......@@ -39,12 +40,14 @@ bench:
variables:
COMPILER: system
script:
- autoconf && (automake --add-missing 2> /dev/null || true)
- docker build -t bench-image-$COMPILER -f misc/Dockerfile.init --build-arg compiler=$COMPILER .
- docker run -t --rm bench-image-$COMPILER misc/ci-local.sh bench
.bench_template: &bench_definition
stage: test
script:
- autoconf && (automake --add-missing 2> /dev/null || true)
- docker build -t bench-image-$COMPILER -f misc/Dockerfile.init --build-arg compiler=$COMPILER .
- docker run -t --rm bench-image-$COMPILER misc/ci-local.sh bench
only:
......@@ -74,6 +77,7 @@ bench-4.06.0:
opam:
stage: build
script:
- autoconf && (automake --add-missing 2> /dev/null || true)
- docker build -t bench-image -f misc/Dockerfile.init .
- docker build -t opam-image -f misc/Dockerfile.opam .
- docker run -t --rm opam-image opam pin -v -y add why3-ide .
......@@ -81,6 +85,7 @@ opam:
deploy:
stage: deploy
script:
- autoconf && (automake --add-missing 2> /dev/null || true)
- docker build -t bench-image -f misc/Dockerfile.init .
- docker build -t deploy-image -f misc/Dockerfile.deploy .
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
......
FROM bench-image
RUN eval `opam config env` && \
autoconf && \
(automake --add-missing 2> /dev/null || true) && \
./configure && \
make -j2
......
......@@ -2,9 +2,9 @@ FROM ocaml/ocaml:debian-stable
# install dependencies
RUN apt-get update && \
apt-get install -y autoconf automake wget libgmp-dev gtk+-2.0 libgtksourceview2.0-dev gnome-themes-standard libcanberra-gtk-module opam
apt-get install -y wget libgmp-dev gtk+-2.0 libgtksourceview2.0-dev gnome-themes-standard libcanberra-gtk-module opam
#create user
# create user
RUN sudo adduser --disabled-password --gecos '' why3
USER why3
ENV HOME /home/why3
......
FROM bench-image
RUN autoconf && \
(automake --add-missing 2> /dev/null || true)
RUN opam pin -v -y add why3 .
......@@ -2,7 +2,7 @@
# Runner installation
# -------------------
# apt-get install curl
# apt-get install curl autoconf automake
# curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh | bash
# curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
# apt-key fingerprint 0EBFCD88
......@@ -17,20 +17,10 @@
set -e
eval `opam config env`
# configuration
autoconf
automake --add-missing 2> /dev/null || true
./configure --enable-local
# compilation
make -j2
if test "$1" = bench; then
# detection of provers
bin/why3config --detect-provers
# run the bench
make bench
fi
Markdown is supported
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