Use a new CI image (#75)

CertiCoq · Oct 5, 2023 · 4056b05 · 4056b05
1 parent 856f0dc
commit 4056b05
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,8 @@ jobs:
  opam_file:
  - 'coq-certicoq.opam'
  image:
- - 'mattam82/coq:8.17--ocaml-4.13.1--clang-11--compcert-3.12--extlib-0.11.8--equations-1.3'
+ # - 'mattam82/coq:8.17--ocaml-4.13.1--clang-11--compcert-3.12--extlib-0.11.8--equations-1.3' # comment back in if MetaCoq commit changes
+ - 'yforster/coq:8.17.0--clang-11--compcert-3.12--extlib-0.11.8--equations-1.3--elpi.1.17.1-metacoq-8.17.dev.e0794e3'
  fail-fast: false # don't stop jobs if one fails
  steps:
  - uses: actions/checkout@v2
@@ -29,13 +30,13 @@ jobs:
  with:
  custom_image: ${{ matrix.image }}
  opam_file: ${{ matrix.opam_file }}
- before_install: |
- startGroup "fix permission issues"
- sudo chown -R coq:coq .
- endGroup
- startGroup "opam pin"
- opam pin -n -y submodules/metacoq
- endGroup
+ # before_install: | # comment back in if MetaCoq commit changes
+ #  startGroup "fix permission issues"
+ #  sudo chown -R coq:coq .
+ #  endGroup
+ #  startGroup "opam pin"
+ #  opam pin -n -y submodules/metacoq
+ #  endGroup
  before_script: |
  startGroup "fix permission issues"
  sudo chown -R coq:coq .

diff --git a/bootstrap/certicoqc/Makefile b/bootstrap/certicoqc/Makefile
@@ -1,4 +1,4 @@
-CCOMPILER = clang # ccomp # gcc takes ages
+CCOMPILER := $(shell { command -v clang-11 || command -v clang; } 2>/dev/null)
 
 -include ../../Makefile.conf
 

diff --git a/bootstrap/certicoqchk/Makefile b/bootstrap/certicoqchk/Makefile
@@ -1,4 +1,4 @@
-CCOMPILER = clang # ccomp # gcc
+CCOMPILER := $(shell { command -v clang-11 || command -v clang; } 2>/dev/null)
 
 -include ../../Makefile.conf
 

diff --git a/coq-certicoq.opam b/coq-certicoq.opam
@@ -1,4 +1,5 @@
 opam-version: "2.0"
+version: "dev+8.17"
 maintainer: "The CertiCoq Team"
 homepage: "https://certicoq.org/"
 dev-repo: "git+https://github.com/CertiCoq/certicoq"