From e1154c1998d890ce8bdc9069c9bcb15c7e8824dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= <theo.zimmermann@telecom-paris.fr>
Date: Mon, 28 Oct 2024 14:17:04 +0100
Subject: [PATCH 1/2] Bump OCaml version used in Docker image.

This is required since the update of mirage-crypto.
The deployment job was failing because it needed OCaml >= 4.13.
---
 coq-bot.opam       | 1 -
 dune-project       | 1 -
 release.Dockerfile | 6 +++---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/coq-bot.opam b/coq-bot.opam
index c10cd98a..f23e405a 100644
--- a/coq-bot.opam
+++ b/coq-bot.opam
@@ -7,7 +7,6 @@ license: "MIT"
 homepage: "https://github.com/coq/bot"
 bug-reports: "https://github.com/coq/bot/issues"
 depends: [
-  "ocaml" {>= "4.10"}
   "dune" {>= "2.2"}
   "base" {>= "v0.14.0"}
   "lwt" {>= "5.6.0"}
diff --git a/dune-project b/dune-project
index ee67456c..17a1beb6 100644
--- a/dune-project
+++ b/dune-project
@@ -12,7 +12,6 @@
  (name coq-bot)
  (synopsis "A (Coq Development Team) bot written in OCaml")
  (depends
-  (ocaml (>= 4.10))
   (dune (>= 2.2))
   (base (>= v0.14.0))
   (lwt (>= 5.6.0))
diff --git a/release.Dockerfile b/release.Dockerfile
index 012e0d85..5b784af4 100644
--- a/release.Dockerfile
+++ b/release.Dockerfile
@@ -1,4 +1,4 @@
-FROM ocaml/opam2:alpine-3.10-ocaml-4.10 AS builder
+FROM ocaml/opam:alpine-3.20-ocaml-5.2 AS builder
 
 WORKDIR /src
 COPY coq-bot.opam bot-components.opam ./
@@ -6,7 +6,7 @@ COPY coq-bot.opam bot-components.opam ./
 # Install the OCaml libraries needed to compile the program
 RUN echo 'archive-mirrors: [ "https://opam.ocaml.org/cache" ]' >> ~/.opam/config \
   && opam repository set-url default http://opam.ocaml.org \
-  && opam switch 4.10 \
+  && opam switch 5.2 \
   && echo 'pre-session-commands: [ "sudo" "apk" "add" depexts ]' >> ~/.opam/config \
   && OPAMSOLVERTIMEOUT=300 opam install --deps-only .
 
@@ -19,7 +19,7 @@ RUN opam install . --destdir /src/opam-install
 RUN OPAMSOLVERTIMEOUT=300 opam depext -ln coq-bot > /src/depexts-coq-bot
 
 
-FROM alpine:3.10 AS app
+FROM alpine:3.20 AS app
 
 WORKDIR /app
 

From bee4e868aa0c31ab5701b72c0577ae3b626a91c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= <theo.zimmermann@telecom-paris.fr>
Date: Mon, 28 Oct 2024 14:22:19 +0100
Subject: [PATCH 2/2] Release the version constraint on ssl.

The underlying bug was fixed and the constraints is not compatible with OCaml 5.2.
---
 bot-components.opam | 2 +-
 dune-project        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot-components.opam b/bot-components.opam
index 502a57ea..bbf68e21 100644
--- a/bot-components.opam
+++ b/bot-components.opam
@@ -13,7 +13,7 @@ depends: [
   "cohttp-lwt" {>= "2.5.4"}
   "cohttp-lwt-unix" {>= "2.5.4"}
   "lwt_ssl" {>= "1.1.3"}
-  "ssl" {= "0.5.9"}
+  "ssl" {>= "0.5.9"}
   "stdio" {>= "v0.14.0"}
   "ohex" {>= "0.2.0"}
   "mirage-crypto" {>= "1.0.0"}
diff --git a/dune-project b/dune-project
index 17a1beb6..77200794 100644
--- a/dune-project
+++ b/dune-project
@@ -39,7 +39,7 @@
   (cohttp-lwt (>= 2.5.4))
   (cohttp-lwt-unix (>= 2.5.4))
   (lwt_ssl (>= 1.1.3))
-  (ssl (= 0.5.9))
+  (ssl (>= 0.5.9))
   (stdio (>= v0.14.0))
   (ohex (>= 0.2.0))
   (mirage-crypto (>= 1.0.0))