Merge pull request #484 from codecrafters-io/andy/upgrade-ocaml

andy1li · web-flow · commit 5f2622e4c6b1 · 2026-01-28T08:00:36.000Z
Update OCaml to 5.4
diff --git a/compiled_starters/ocaml/codecrafters.yml b/compiled_starters/ocaml/codecrafters.yml
@@ -7,5 +7,5 @@ debug: false
 # Use this to change the OCaml version used to run your code
 # on Codecrafters.
 #
-# Available versions: ocaml-5.3
-buildpack: ocaml-5.3
+# Available versions: ocaml-5.4
+buildpack: ocaml-5.4
diff --git a/compiled_starters/ocaml/codecrafters_redis.opam b/compiled_starters/ocaml/codecrafters_redis.opam
@@ -8,7 +8,7 @@ license: "MIT"
 homepage: "https://codecrafters.io"
 bug-reports: "https://github.com/codecrafters-io/build-your-own-redis/issues"
 depends: [
-  "dune" {>= "3.16"}
+  "dune" {>= "3.21"}
   "odoc" {with-doc}
 ]
 build: [
@@ -25,3 +25,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: ["(latest)"]
diff --git a/compiled_starters/ocaml/dune-project b/compiled_starters/ocaml/dune-project
@@ -1,4 +1,4 @@
-(lang dune 3.16)
+(lang dune 3.21)
 
 (name codecrafters_redis)
 
diff --git a/dockerfiles/ocaml-5.4.Dockerfile b/dockerfiles/ocaml-5.4.Dockerfile
@@ -0,0 +1,26 @@
+# syntax=docker/dockerfile:1.7-labs
+FROM ocaml/opam:debian-13-ocaml-5.4
+
+# The image uses opam as the user, so let's set OPAMROOT to re-use whatever is already built
+ENV OPAMROOT /home/opam/.opam
+
+# Ensures the container is re-built if dune/dune-project changes
+ENV CODECRAFTERS_DEPENDENCY_FILE_PATHS="dune,dune-project,codecrafters_redis.opam"
+
+# Change to root user. All other images seem to use root, so let's do the same here
+# hadolint ignore=DL3002
+USER root
+
+# Install dune
+RUN opam install dune.3.21.0 --yes
+
+# Dune path is /home/opam/.opam/5.4/bin/dune
+ENV PATH="${OPAMROOT}/5.4/bin:${PATH}"
+
+WORKDIR /app
+
+# .git & README.md are unique per-repository. We ignore them on first copy to prevent cache misses
+COPY --exclude=.git --exclude=README.md . /app
+
+# Cache dependencies
+RUN opam install . --yes
diff --git a/solutions/ocaml/01-jm1/code/codecrafters.yml b/solutions/ocaml/01-jm1/code/codecrafters.yml
@@ -7,5 +7,5 @@ debug: false
 # Use this to change the OCaml version used to run your code
 # on Codecrafters.
 #
-# Available versions: ocaml-5.3
-buildpack: ocaml-5.3
+# Available versions: ocaml-5.4
+buildpack: ocaml-5.4
diff --git a/solutions/ocaml/01-jm1/code/codecrafters_redis.opam b/solutions/ocaml/01-jm1/code/codecrafters_redis.opam
@@ -8,7 +8,7 @@ license: "MIT"
 homepage: "https://codecrafters.io"
 bug-reports: "https://github.com/codecrafters-io/build-your-own-redis/issues"
 depends: [
-  "dune" {>= "3.16"}
+  "dune" {>= "3.21"}
   "odoc" {with-doc}
 ]
 build: [
@@ -25,3 +25,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: ["(latest)"]
diff --git a/solutions/ocaml/01-jm1/code/dune-project b/solutions/ocaml/01-jm1/code/dune-project
@@ -1,4 +1,4 @@
-(lang dune 3.16)
+(lang dune 3.21)
 
 (name codecrafters_redis)
 
diff --git a/solutions/ocaml/02-rg2/code/codecrafters.yml b/solutions/ocaml/02-rg2/code/codecrafters.yml
@@ -7,5 +7,5 @@ debug: false
 # Use this to change the OCaml version used to run your code
 # on Codecrafters.
 #
-# Available versions: ocaml-5.3
-buildpack: ocaml-5.3
+# Available versions: ocaml-5.4
+buildpack: ocaml-5.4
diff --git a/solutions/ocaml/02-rg2/code/codecrafters_redis.opam b/solutions/ocaml/02-rg2/code/codecrafters_redis.opam
@@ -8,7 +8,7 @@ license: "MIT"
 homepage: "https://codecrafters.io"
 bug-reports: "https://github.com/codecrafters-io/build-your-own-redis/issues"
 depends: [
-  "dune" {>= "3.16"}
+  "dune" {>= "3.21"}
   "odoc" {with-doc}
 ]
 build: [
@@ -25,3 +25,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: ["(latest)"]
diff --git a/solutions/ocaml/02-rg2/code/dune-project b/solutions/ocaml/02-rg2/code/dune-project
@@ -1,4 +1,4 @@
-(lang dune 3.16)
+(lang dune 3.21)
 
 (name codecrafters_redis)
 
diff --git a/starter_templates/ocaml/code/codecrafters_redis.opam b/starter_templates/ocaml/code/codecrafters_redis.opam
@@ -8,7 +8,7 @@ license: "MIT"
 homepage: "https://codecrafters.io"
 bug-reports: "https://github.com/codecrafters-io/build-your-own-redis/issues"
 depends: [
-  "dune" {>= "3.16"}
+  "dune" {>= "3.21"}
   "odoc" {with-doc}
 ]
 build: [
@@ -25,3 +25,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+x-maintenance-intent: ["(latest)"]
diff --git a/starter_templates/ocaml/code/dune-project b/starter_templates/ocaml/code/dune-project
@@ -1,4 +1,4 @@
-(lang dune 3.16)
+(lang dune 3.21)
 
 (name codecrafters_redis)
 

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ debug: false`
`7`	`7`	`# Use this to change the OCaml version used to run your code`
`8`	`8`	`# on Codecrafters.`
`9`	`9`	`#`
`10`		`-# Available versions: ocaml-5.3`
`11`		`-buildpack: ocaml-5.3`
	`10`	`+# Available versions: ocaml-5.4`
	`11`	`+buildpack: ocaml-5.4`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ license: "MIT"`
`8`	`8`	`homepage: "https://codecrafters.io"`
`9`	`9`	`bug-reports: "https://github.com/codecrafters-io/build-your-own-redis/issues"`
`10`	`10`	`depends: [`
`11`		`- "dune" {>= "3.16"}`
	`11`	`+ "dune" {>= "3.21"}`
`12`	`12`	`"odoc" {with-doc}`
`13`	`13`	`]`
`14`	`14`	`build: [`
`@@ -25,3 +25,4 @@ build: [`
`25`	`25`	`"@doc" {with-doc}`
`26`	`26`	`]`
`27`	`27`	`]`
	`28`	`+x-maintenance-intent: ["(latest)"]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-(lang dune 3.16)`
	`1`	`+(lang dune 3.21)`
`2`	`2`
`3`	`3`	`(name codecrafters_redis)`
`4`	`4`