From 5bd384b0cb6225c7e64e88fbd4b55e956aa87194 Mon Sep 17 00:00:00 2001 From: Yishuai Li Date: Mon, 22 Apr 2024 18:03:46 +0800 Subject: [PATCH] [docker 8.19] [docker dev] --- .circleci/Dockerfile.8.17 | 2 +- .circleci/Dockerfile.8.18 | 9 +++++++++ .circleci/Dockerfile.8.19 | 9 +++++++++ .circleci/Dockerfile.dev | 14 ++------------ .circleci/Makefile | 4 +--- .circleci/config.yml | 15 +++++++++++++++ 6 files changed, 37 insertions(+), 16 deletions(-) create mode 100644 .circleci/Dockerfile.8.18 create mode 100644 .circleci/Dockerfile.8.19 diff --git a/.circleci/Dockerfile.8.17 b/.circleci/Dockerfile.8.17 index ccf5103e5..42a3e9cb3 100644 --- a/.circleci/Dockerfile.8.17 +++ b/.circleci/Dockerfile.8.17 @@ -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` \ diff --git a/.circleci/Dockerfile.8.18 b/.circleci/Dockerfile.8.18 new file mode 100644 index 000000000..3db3841c4 --- /dev/null +++ b/.circleci/Dockerfile.8.18 @@ -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 diff --git a/.circleci/Dockerfile.8.19 b/.circleci/Dockerfile.8.19 new file mode 100644 index 000000000..90627425e --- /dev/null +++ b/.circleci/Dockerfile.8.19 @@ -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 diff --git a/.circleci/Dockerfile.dev b/.circleci/Dockerfile.dev index 08f81da32..77acca7c9 100644 --- a/.circleci/Dockerfile.dev +++ b/.circleci/Dockerfile.dev @@ -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 \ diff --git a/.circleci/Makefile b/.circleci/Makefile index 1799972df..9902ade11 100644 --- a/.circleci/Makefile +++ b/.circleci/Makefile @@ -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.$@ diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f712d548..165b6396b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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