Skip to content

Commit

Permalink
Merge PR coq#19874: [ci] bump elpi to 2.0.x
Browse files Browse the repository at this point in the history
Reviewed-by: SkySkimmer
Co-authored-by: SkySkimmer <[email protected]>
  • Loading branch information
coqbot-app[bot] and SkySkimmer authored Nov 28, 2024
2 parents f510137 + 29e23e9 commit 8939dfb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ variables:
# echo $(md5sum dev/ci/docker/old_ubuntu_lts/Dockerfile | head -c 10)
# echo $(md5sum dev/ci/docker/edge_ubuntu/Dockerfile | head -c 10)
BASE_CACHEKEY: "old_ubuntu_lts-V2024-10-11-f72b1aa7c6"
EDGE_CACHEKEY: "edge_ubuntu-V2024-10-11-e53fa90d32"
EDGE_CACHEKEY: "edge_ubuntu-V2024-11-28-262e4a8ded"
BASE_IMAGE: "$CI_REGISTRY_IMAGE:$BASE_CACHEKEY"
EDGE_IMAGE: "$CI_REGISTRY_IMAGE:$EDGE_CACHEKEY"

Expand Down
4 changes: 2 additions & 2 deletions dev/ci/docker/edge_ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Update CACHEKEY in the .gitlab-ci.yml when modifying this file.

FROM ubuntu:23.04
FROM ubuntu:24.04
LABEL maintainer="[email protected]"

ENV DEBIAN_FRONTEND="noninteractive"
Expand Down Expand Up @@ -42,7 +42,7 @@ ENV COMPILER="4.14.1" \
BASE_OPAM="zarith.1.13 ounit2.2.2.6" \
CI_OPAM="ocamlgraph.2.0.0 cppo.1.6.9" \
BASE_OPAM_EDGE="dune.3.14.0 dune-build-info.3.14.0 dune-release.2.0.0 ocamlfind.1.9.6 odoc.2.3.1" \
CI_OPAM_EDGE="elpi.1.20.0 ppx_import.1.10.0 cmdliner.1.1.1 sexplib.v0.15.1 ppx_sexp_conv.v0.15.1 ppx_hash.v0.15.0 ppx_compare.v0.15.0 ppx_deriving_yojson.3.7.0 yojson.2.1.0 uri.4.2.0 ppx_yojson_conv.v0.15.1 ppx_inline_test.v0.15.1 ppx_assert.v0.15.0 ppx_optcomp.v0.15.0 lsp.1.16.2 sel.0.4.0" \
CI_OPAM_EDGE="elpi.2.0.3 ppx_import.1.10.0 cmdliner.1.1.1 sexplib.v0.15.1 ppx_sexp_conv.v0.15.1 ppx_hash.v0.15.0 ppx_compare.v0.15.0 ppx_deriving_yojson.3.7.0 yojson.2.1.0 uri.4.2.0 ppx_yojson_conv.v0.15.1 ppx_inline_test.v0.15.1 ppx_assert.v0.15.0 ppx_optcomp.v0.15.0 lsp.1.16.2 sel.0.4.0" \
COQIDE_OPAM_EDGE="lablgtk3-sourceview3.3.1.3"

# EDGE+flambda switch, we install CI_OPAM as to be able to use
Expand Down
3 changes: 3 additions & 0 deletions dev/ci/user-overlays/19874-gares-elpi-2.0.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
overlay elpi https://github.com/LPCIC/coq-elpi elpi-2.0 19874
overlay trakt https://github.com/gares/trakt elpi-2.0 19874
overlay corn "https://github.com/gares/corn" elpi-2.0 19874

0 comments on commit 8939dfb

Please sign in to comment.