Skip to content

Commit 8f2aa73

Browse files
committed
update dockerfile and github actions
Signed-off-by: Avi Shinnar <shinnar@us.ibm.com>
1 parent bb3dc31 commit 8f2aa73

3 files changed

Lines changed: 13 additions & 46 deletions

File tree

.github/workflows/build.yml

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest # container actions require GNU/Linux
1111
strategy:
1212
matrix:
13-
coq_container:
14-
# - coqorg/coq:8.12.2
15-
# - coqorg/coq:8.16.1-ocaml-4.13.1-flambda
16-
- coqorg/coq:8.18.0-ocaml-4.13.1-flambda
13+
rocq_container:
14+
- rocq/rocq-prover:9.0.1-ocaml-4.14.2-flambda
1715
container:
18-
image: ${{ matrix.coq_container }}
16+
image: ${{ matrix.rocq_container }}
1917
options: --user root
2018
steps:
2119
- uses: actions/checkout@v4
@@ -26,31 +24,8 @@ jobs:
2624
- name: ls
2725
run: ls -la .
2826
- name: Install Opam dependencies
29-
run: su coq -c 'eval $(opam env) && opam install --deps-only --with-test --with-doc -y -j 2 ./Formal_ML.opam'
27+
run: su rocq -c 'eval $(opam env) && opam install --deps-only --with-test --with-doc -y -j 2 ./Formal_ML.opam'
3028
- name: Build using Make
31-
run: su coq -c 'eval $(opam env) && make -kj 2'
29+
run: su rocq -c 'eval $(opam env) && make -kj 2'
3230
- name: Build documentation
33-
run: su coq -c 'eval $(opam env) && make -kj 2 doc'
34-
35-
# - uses: coq-community/docker-coq-action@v1
36-
# with:
37-
# opam_file: 'Formal_ML.opam'
38-
# coq_version: ${{ matrix.coq_version }}
39-
# ocaml_version: ${{ matrix.ocaml_version }}
40-
# # export: 'OPAMWITHTEST OPAMWITHDOC'
41-
# export: 'OPAMWITHDOC'
42-
# after_script: |
43-
# sudo cp -a $(opam config var Formal_ML:build)/documentation .
44-
# env:
45-
# OPAMWITHDOC: 'true'
46-
# OPAMWITHTEST: 'true'
47-
# - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
48-
# name: deploy documentation
49-
# uses: JamesIves/github-pages-deploy-action@3.7.1
50-
# with:
51-
# ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
52-
# REPOSITORY_NAME: FormalML/FormalML.github.io # the target repository
53-
# TARGET_FOLDER: main/documentation # target directory
54-
# BRANCH: main # The branch the action should deploy to.
55-
# FOLDER: documentation # The folder the action should deploy.
56-
# CLEAN: true # Automatically remove deleted files from the deploy branch
31+
run: su rocq -c 'eval $(opam env) && make -kj 2 doc'

Dockerfile

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
ARG coq_image="coqorg/coq:8.12.2"
2-
FROM ${coq_image}
1+
ARG rocq_image="rocq/rocq-prover:9.0.1"
2+
FROM ${rocq_image}
33

44
MAINTAINER Avi Shinnar "shinnar@us.ibm.com"
55

66
# needs to be a subdirectory to avoid causing problems with
7-
# the /home/coq/.opam directory (and probably other stuff)
8-
WORKDIR /home/coq
7+
# the /home/rocq/.opam directory (and probably other stuff)
8+
WORKDIR /home/rocq
99

10-
COPY --chown=coq:coq Formal_ML.opam ./formal_ml/
10+
COPY --chown=rocq:rocq Formal_ML.opam ./formal_ml/
1111

1212
RUN ["/bin/bash", "--login", "-c", "set -x \
1313
&& if [ -n \"${COMPILER_EDGE}\" ]; then opam switch ${COMPILER_EDGE} && eval $(opam env); fi \
@@ -16,12 +16,8 @@ RUN ["/bin/bash", "--login", "-c", "set -x \
1616
&& opam clean -a -c -s --logs"]
1717

1818

19-
COPY --chown=coq:coq _CoqProject Makefile Makefile.rocq_modules ./formal_ml/
20-
COPY --chown=coq:coq coq ./formal_ml/coq
21-
COPY --chown=coq:coq ocaml ./formal_ml/ocaml
19+
COPY --chown=rocq:rocq _RocqProject Makefile Makefile.rocq_modules ./formal_ml/
20+
COPY --chown=rocq:rocq coq ./formal_ml/coq
2221

2322
RUN ["/bin/bash", "--login", "-c", "set -x && cd formal_ml && \
2423
make && make doc"]
25-
26-
# CMD ["/bin/bash", "--login", "-c", "set -x && cd formal_ml && \
27-
# make test"]

Formal_ML.opam

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ depends: [
1414
"rocq-mathcomp-ssreflect"
1515
"coq-coquelicot"
1616
"coq-ext-lib" {<= "1.0.0"}
17-
"ocamlbuild"
18-
"base64"
19-
"menhir"
20-
"csv"
2117
"coq-coq2html" {with-doc}
2218
]
2319
build: [[make]

0 commit comments

Comments
 (0)