Skip to content

Commit

Permalink
Merge pull request #414 from mtelvers/ocaml-5.3
Browse files Browse the repository at this point in the history
Update ocaml-version and ocaml-dockerfile
  • Loading branch information
mtelvers authored Jan 14, 2025
2 parents 19dbc43 + acd62c5 commit 5016ba2
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 90 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ocaml/opam:debian-12-ocaml-4.14 AS build
RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
RUN sudo apt-get update && sudo apt-get install libev-dev capnproto graphviz m4 pkg-config libsqlite3-dev libgmp-dev libffi-dev -y --no-install-recommends
RUN cd ~/opam-repository && git fetch origin master && git reset --hard 2dff29abd6cda0706f80503db11dd4af4e7db559 && opam update
RUN cd ~/opam-repository && git fetch origin master && git reset --hard 20f04c842252bdb1bd98bbe0f9c813f203d2b5dc && opam update
COPY --chown=opam opam-repo-ci-service.opam opam-repo-ci-api.opam opam-ci-check.opam /src/
WORKDIR /src
RUN opam install -y --deps-only .
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.web
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ocaml/opam:debian-12-ocaml-4.14 AS build
RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
RUN sudo apt-get update && sudo apt-get install libev-dev capnproto m4 pkg-config libgmp-dev libffi-dev -y --no-install-recommends
RUN cd ~/opam-repository && git fetch origin master && git reset --hard 65a1519b6d82a358204a1a33b6d84821d56da6bd && opam update
RUN cd ~/opam-repository && git fetch origin master && git reset --hard 20f04c842252bdb1bd98bbe0f9c813f203d2b5dc && opam update
COPY --chown=opam opam-repo-ci-api.opam opam-repo-ci-web.opam opam-repo-ci-service.opam opam-ci-check.opam /src/
WORKDIR /src
RUN opam install -y --deps-only .
Expand Down
62 changes: 31 additions & 31 deletions doc/platforms.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,21 @@
- 5.0
- 5.1
- 5.2
- 5.2-afl
- 5.2-flambda
- 5.2-no-flat-float-array
- 5.3~rc1
- 5.3
- 5.3-afl
- 5.3-flambda
- 5.3-no-flat-float-array

## Platforms Matrix

| OS | Arch | OCaml version |Opam version | Test lower-bounds | Test reverse dependencies |
| --- | --- | --- | --- | --- | --- |
| alpine-3.21 | amd64 | 4.14 | dev | No | No |
| alpine-3.21 | amd64 | 5.2 | dev | No | No |
| alpine-3.21 | amd64 | 5.3 | dev | No | No |
| archlinux | amd64 | 4.14 | dev | No | No |
| archlinux | amd64 | 5.2 | dev | No | No |
| archlinux | amd64 | 5.3 | dev | No | No |
| debian-11 | amd64 | 4.14 | dev | No | No |
| debian-11 | amd64 | 5.2 | dev | No | No |
| debian-11 | amd64 | 5.3 | dev | No | No |
| debian-12 | amd64 | 4.02 | dev | Yes | No |
| debian-12 | amd64 | 4.03 | dev | Yes | No |
| debian-12 | amd64 | 4.04 | dev | Yes | No |
Expand All @@ -91,46 +91,46 @@
| debian-12 | amd64 | 4.14-no-flat-float-array | dev | No | No |
| debian-12 | amd64 | 5.0 | dev | Yes | No |
| debian-12 | amd64 | 5.1 | dev | Yes | No |
| debian-12 | amd64 | 5.2 | dev | Yes | Yes |
| debian-12 | amd64 | 5.2-afl | dev | No | No |
| debian-12 | amd64 | 5.2-flambda | dev | No | No |
| debian-12 | amd64 | 5.2-no-flat-float-array | dev | No | No |
| debian-12 | amd64 | 5.3~rc1 | dev | Yes | No |
| debian-12 | amd64 | 5.2 | dev | Yes | No |
| debian-12 | amd64 | 5.3 | dev | Yes | Yes |
| debian-12 | amd64 | 5.3-afl | dev | No | No |
| debian-12 | amd64 | 5.3-flambda | dev | No | No |
| debian-12 | amd64 | 5.3-no-flat-float-array | dev | No | No |
| debian-12 | arm32v7 | 4.14 | dev | No | No |
| debian-12 | arm32v7 | 5.2 | dev | No | No |
| debian-12 | arm32v7 | 5.3 | dev | No | No |
| debian-12 | arm64 | 4.14 | dev | No | No |
| debian-12 | arm64 | 5.2 | dev | No | No |
| debian-12 | arm64 | 5.3 | dev | No | No |
| debian-12 | i386 | 4.14 | dev | No | No |
| debian-12 | i386 | 5.2 | dev | No | No |
| debian-12 | i386 | 5.3 | dev | No | No |
| debian-12 | ppc64le | 4.14 | dev | No | No |
| debian-12 | ppc64le | 5.2 | dev | No | No |
| debian-12 | ppc64le | 5.3 | dev | No | No |
| debian-12 | s390x | 4.14 | dev | No | No |
| debian-12 | s390x | 5.2 | dev | No | No |
| debian-12 | s390x | 5.3 | dev | No | No |
| debian-testing | amd64 | 4.14 | dev | No | No |
| debian-testing | amd64 | 5.2 | dev | No | No |
| debian-testing | amd64 | 5.3 | dev | No | No |
| debian-unstable | amd64 | 4.14 | dev | No | No |
| debian-unstable | amd64 | 5.2 | dev | No | No |
| debian-unstable | amd64 | 5.3 | dev | No | No |
| fedora-40 | amd64 | 4.14 | dev | No | No |
| fedora-40 | amd64 | 5.2 | dev | No | No |
| fedora-40 | amd64 | 5.3 | dev | No | No |
| fedora-41 | amd64 | 4.14 | dev | No | No |
| fedora-41 | amd64 | 5.2 | dev | No | No |
| fedora-41 | amd64 | 5.3 | dev | No | No |
| freebsd | amd64 | 4.14 | dev | No | No |
| freebsd | amd64 | 5.2 | dev | No | No |
| freebsd | amd64 | 5.3 | dev | No | No |
| macos-homebrew | amd64 | 4.14 | dev | No | No |
| macos-homebrew | amd64 | 5.2 | dev | No | No |
| macos-homebrew | amd64 | 5.3 | dev | No | No |
| macos-homebrew | arm64 | 4.14 | dev | No | No |
| macos-homebrew | arm64 | 5.2 | dev | No | No |
| macos-homebrew | arm64 | 5.3 | dev | No | No |
| opensuse-15.6 | amd64 | 4.14 | dev | No | No |
| opensuse-15.6 | amd64 | 5.2 | dev | No | No |
| opensuse-15.6 | amd64 | 5.3 | dev | No | No |
| opensuse-tumbleweed | amd64 | 4.14 | dev | No | No |
| opensuse-tumbleweed | amd64 | 5.2 | dev | No | No |
| opensuse-tumbleweed | amd64 | 5.3 | dev | No | No |
| ubuntu-20.04 | amd64 | 4.14 | dev | No | No |
| ubuntu-20.04 | amd64 | 5.2 | dev | No | No |
| ubuntu-20.04 | amd64 | 5.3 | dev | No | No |
| ubuntu-22.04 | amd64 | 4.14 | dev | No | No |
| ubuntu-22.04 | amd64 | 5.2 | dev | No | No |
| ubuntu-22.04 | amd64 | 5.3 | dev | No | No |
| ubuntu-24.04 | amd64 | 4.14 | dev | No | No |
| ubuntu-24.04 | amd64 | 5.2 | dev | No | No |
| ubuntu-24.04 | amd64 | 5.3 | dev | No | No |
| ubuntu-24.04 | riscv64 | 4.14 | dev | No | No |
| ubuntu-24.04 | riscv64 | 5.2 | dev | No | No |
| ubuntu-24.04 | riscv64 | 5.3 | dev | No | No |
| ubuntu-24.10 | amd64 | 4.14 | dev | No | No |
| ubuntu-24.10 | amd64 | 5.2 | dev | No | No |
| ubuntu-24.10 | amd64 | 5.3 | dev | No | No |
2 changes: 1 addition & 1 deletion opam-ci-check/test/build.t
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Test the build command:


$ opam-ci-check build lwt.5.7.0 --only-print
FROM ocaml/opam:debian-12-ocaml-5.2
FROM ocaml/opam:debian-12-ocaml-5.3
USER 1000:1000
WORKDIR /home/opam
RUN sudo ln -f /usr/bin/opam-dev /usr/bin/opam
Expand Down
Loading

0 comments on commit 5016ba2

Please sign in to comment.