From c505d8054b695c1dfc1c91587a268ab4d65a4f81 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Tue, 26 Nov 2024 15:54:03 +0100 Subject: [PATCH 1/3] bump ubuntu to 24.04 --- .gitlab-ci.yml | 2 +- dev/ci/docker/edge_ubuntu/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8dc0c147ae66..b3e7ad99e91e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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-25-19a84952e5" BASE_IMAGE: "$CI_REGISTRY_IMAGE:$BASE_CACHEKEY" EDGE_IMAGE: "$CI_REGISTRY_IMAGE:$EDGE_CACHEKEY" diff --git a/dev/ci/docker/edge_ubuntu/Dockerfile b/dev/ci/docker/edge_ubuntu/Dockerfile index 4f1428932565..d8b6562b6aa4 100644 --- a/dev/ci/docker/edge_ubuntu/Dockerfile +++ b/dev/ci/docker/edge_ubuntu/Dockerfile @@ -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="e@x80.org" ENV DEBIAN_FRONTEND="noninteractive" From 174aa2d40c4a755e6f514e9a35e43e66bed00944 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Fri, 22 Nov 2024 15:52:57 +0100 Subject: [PATCH 2/3] [ci] bump elpi to 2.0.x --- .gitlab-ci.yml | 2 +- dev/ci/docker/edge_ubuntu/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3e7ad99e91e..8e65695b2e52 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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-11-25-19a84952e5" + EDGE_CACHEKEY: "edge_ubuntu-V2024-11-28-262e4a8ded" BASE_IMAGE: "$CI_REGISTRY_IMAGE:$BASE_CACHEKEY" EDGE_IMAGE: "$CI_REGISTRY_IMAGE:$EDGE_CACHEKEY" diff --git a/dev/ci/docker/edge_ubuntu/Dockerfile b/dev/ci/docker/edge_ubuntu/Dockerfile index d8b6562b6aa4..f8549b9857e3 100644 --- a/dev/ci/docker/edge_ubuntu/Dockerfile +++ b/dev/ci/docker/edge_ubuntu/Dockerfile @@ -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 From 29e23e928c05747bd9df6517427b81f6b690f9b9 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Tue, 26 Nov 2024 18:21:06 +0100 Subject: [PATCH 3/3] overlay --- dev/ci/user-overlays/19874-gares-elpi-2.0.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 dev/ci/user-overlays/19874-gares-elpi-2.0.sh diff --git a/dev/ci/user-overlays/19874-gares-elpi-2.0.sh b/dev/ci/user-overlays/19874-gares-elpi-2.0.sh new file mode 100644 index 000000000000..c280a02e0a13 --- /dev/null +++ b/dev/ci/user-overlays/19874-gares-elpi-2.0.sh @@ -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