From 192ec63c277bc45a749921fa9b93bcbe25a03518 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Sun, 19 Nov 2023 12:30:30 -0800 Subject: [PATCH] Revert "Comment out install-dev test" This reverts commit 4f167c83add8cfad8fe1a7dd88559e4a8e0cffb6. --- .github/workflows/coq-docker.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/coq-docker.yml b/.github/workflows/coq-docker.yml index c8fcda1934e..0a70121d549 100644 --- a/.github/workflows/coq-docker.yml +++ b/.github/workflows/coq-docker.yml @@ -110,17 +110,16 @@ jobs: etc/ci/github-actions-docker-make.sh ${EXTRA_GH_REPORTIFY} --dry-run EXTERNAL_DEPENDENCIES=1 SKIP_BEDROCK2=1 install-without-bedrock2 install-standalone-ocaml sudo git config --global --add safe.directory "*" sudo make EXTERNAL_DEPENDENCIES=1 SKIP_BEDROCK2=1 COQBIN="$(dirname "$(which coqc)")/" install-without-bedrock2 install-standalone-ocaml -# blocking on https://github.com/mit-plv/bedrock2/issues/388 -# - name: install-dev -# uses: coq-community/docker-coq-action@v1 -# with: -# coq_version: ${{ matrix.env.DOCKER_COQ_VERSION }} -# ocaml_version: ${{ matrix.env.DOCKER_OCAML_VERSION }} -# export: CI ALLOW_DIFF COQCHKEXTRAFLAGS -# custom_script: | -# etc/ci/github-actions-docker-make.sh ${EXTRA_GH_REPORTIFY} --dry-run EXTERNAL_REWRITER=1 EXTERNAL_COQPRIME=1 install install-standalone-ocaml || true # no idea why make fails even with --dry-run here but succeeds above -# sudo git config --global --add safe.directory "*" -# sudo make EXTERNAL_REWRITER=1 EXTERNAL_COQPRIME=1 COQBIN="$(dirname "$(which coqc)")/" install install-standalone-ocaml + - name: install-dev + uses: coq-community/docker-coq-action@v1 + with: + coq_version: ${{ matrix.env.DOCKER_COQ_VERSION }} + ocaml_version: ${{ matrix.env.DOCKER_OCAML_VERSION }} + export: CI ALLOW_DIFF COQCHKEXTRAFLAGS + custom_script: | + etc/ci/github-actions-docker-make.sh ${EXTRA_GH_REPORTIFY} --dry-run EXTERNAL_REWRITER=1 EXTERNAL_COQPRIME=1 install install-standalone-ocaml || true # no idea why make fails even with --dry-run here but succeeds above + sudo git config --global --add safe.directory "*" + sudo make EXTERNAL_REWRITER=1 EXTERNAL_COQPRIME=1 COQBIN="$(dirname "$(which coqc)")/" install install-standalone-ocaml - name: display timing info run: cat time-of-build-pretty.log - name: display per-line timing info