Skip to content

Commit

Permalink
[docker 8.19] [docker dev]
Browse files Browse the repository at this point in the history
  • Loading branch information
liyishuai committed Apr 22, 2024
1 parent d7f9ab7 commit 5bd384b
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .circleci/Dockerfile.8.17
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM coqorg/coq:8.17.1
ENV OPAMYES true
ENV VST_NEEDED 2.11.1
ENV VST_NEEDED 2.12

RUN \
opam install -j `nproc` \
Expand Down
9 changes: 9 additions & 0 deletions .circleci/Dockerfile.8.18
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM coqorg/coq:8.18
ENV OPAMYES true
RUN opam install -j `nproc` \
menhir \
ocamlbuild \
coq-mathcomp-ssreflect \
coq-ext-lib \
coq-simple-io \
coq-quickchick
9 changes: 9 additions & 0 deletions .circleci/Dockerfile.8.19
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM coqorg/coq:8.19
ENV OPAMYES true
RUN opam install -j `nproc` \
ocamlbuild \
coq-ext-lib \
coq-simple-io \
menhir \
coq-mathcomp-ssreflect \
coq-quickchick
14 changes: 2 additions & 12 deletions .circleci/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
FROM coqorg/coq:dev
ENV OPAMYES true
ENV VST_NEEDED 2.11
RUN \
# BCP 3/23: QuickChick is not working with dev version of Coq!
# (once it does,
# sudo apt-get update \
# && sudo apt-get install wget \
# && wget https://github.com/QuickChick/QuickChick/archive/refs/tags/v.2.0+beta.zip \
&& unzip v.2.0+beta.zip \
&& opam install -j `nproc` \
RUN opam install -j `nproc` \
ocamlbuild \
coq-ext-lib \
coq-simple-io \
menhir.20220210 \
coq-vst.$VST_NEEDED \
# && (cd QuickChick-v.2.0-beta; make; make install) \
# && rm -rf QuickChick-v.2.0-beta
coq-quickchick

# BCP 2023: This is probably not needed at all -- delete
# && opam repo add coq-extra-dev https://coq.inria.fr/opam/extra-dev \
4 changes: 1 addition & 3 deletions .circleci/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
all: 8.15 8.16

# all: 8.15 8.16 dev
all: 8.17 8.18 8.19 dev

%: IMAGE=ysli/sfdev:$@
%: DOCKERFILE=Dockerfile.$@
Expand Down
15 changes: 15 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,21 @@ jobs:
docker build -t deepspec/sfdev:8.16 - < Dockerfile.8.16
docker push deepspec/sfdev:8.16
fi
if fgrep -q '[docker 8.17]' \<<< $changes; then
echo "Building 8.17"
docker build -t deepspec/sfdev:8.17 - < Dockerfile.8.17
docker push deepspec/sfdev:8.17
fi
if fgrep -q '[docker 8.18]' \<<< $changes; then
echo "Building 8.18"
docker build -t deepspec/sfdev:8.18 - < Dockerfile.8.18
docker push deepspec/sfdev:8.18
fi
if fgrep -q '[docker 8.19]' \<<< $changes; then
echo "Building 8.19"
docker build -t deepspec/sfdev:8.19 - < Dockerfile.8.19
docker push deepspec/sfdev:8.19
fi
if fgrep -q '[docker dev]' \<<< $changes; then
echo "Building dev"
docker build -t deepspec/sfdev:dev - < Dockerfile.dev
Expand Down

0 comments on commit 5bd384b

Please sign in to comment.