Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build on OCaml 5 (river pin) #2609

Merged
merged 6 commits into from
Aug 9, 2024
Merged

Build on OCaml 5 (river pin) #2609

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8a24ef3
Build on OCaml 5
aantron Jul 22, 2024
192788e
Try with CI on 5.2.0
aantron Jul 22, 2024
f2d9ccd
Fix Dockerfile
Jul 22, 2024
6fe0984
Fix .devcontainer/Dockerfile
aantron Jul 24, 2024
8a7b6e3
Update dune files .opam is generated from
aantron Aug 9, 2024
7953f6a
Switch to upgraded River instead of ocamlnet
aantron Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@
"This repository contains the server that serves the official OCaml website at https://ocaml.org.")
(depends
(ocaml
(and
(>= 4.14.0)
(< 5.0.0)))
(>= 4.14.0))
dune
cohttp
cohttp-lwt-unix
Expand Down
7 changes: 6 additions & 1 deletion dune-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
(lang dune 3.15)

(pin
(name ocamlnet)
(url "git+https://github.com/aantron/ocamlnet#7ef255a0a994ef2721f3359077b36bcdd0428ee4")
(package (name ocamlnet)))

(pin
(name tailwindcss)
(url "git+https://github.com/tmattio/opam-tailwindcss#3e60fc32bbcf82525999d83ad0f395e16107026b")
Expand All @@ -11,4 +16,4 @@
(package (name olinkcheck)))

(lock_dir
(pins tailwindcss olinkcheck))
(pins ocamlnet tailwindcss olinkcheck))
3 changes: 0 additions & 3 deletions ocamlorg.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@ build: [
]
dev-repo: "git+https://github.com/ocaml/ocaml.org.git"
pin-depends: [
# See https://gitlab.com/gerdstolpmann/lib-ocamlnet3/-/merge_requests/24
# See https://github.com/aantron/ocamlnet/commit/7ef255a0a994ef2721f3359077b36bcdd0428ee4
["ocamlnet.dev" "git+https://github.com/aantron/ocamlnet#7ef255a0a994ef2721f3359077b36bcdd0428ee4"]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't been able to get this generated from a dune-workspace (pin ...) stanza. Do you have any experience as to why this isn't being generated in this commit?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the .opam.template file. This is no longer an issue.

["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/3e60fc32bbcf82525999d83ad0f395e16107026b.tar.gz"]
["olinkcheck.~dev" "git+https://github.com/tarides/olinkcheck"]
]
Loading