Skip to content

Commit cc5395e

Browse files
authored
Merge pull request #60 from Sudha247/dune_pkg_new
Dune pkg new
2 parents 1f79aea + 8cf2089 commit cc5395e

File tree

9 files changed

+7
-69
lines changed

9 files changed

+7
-69
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Dune artifacts
22
_build/
33
dune.lock
4+
dev-tools.locks
45

56
# Local OPAM switch
67
_opam/

Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ RUN apk -U upgrade --no-cache && apk add --no-cache \
1313
oniguruma-dev \
1414
openssl-dev
1515

16-
ADD https://get.dune.build/2025-07-17/x86_64-unknown-linux-musl/dune-2025-07-17-x86_64-unknown-linux-musl.tar.gz .
17-
RUN tar xzf dune-2025-07-17-x86_64-unknown-linux-musl.tar.gz
18-
RUN mkdir -p /root/.local/bin \
19-
&& mv dune-2025-07-17-x86_64-unknown-linux-musl/dune /root/.local/bin/
20-
ENV PATH="/root/.local/bin:$PATH"
16+
RUN curl -sSL https://github.com/ocaml-dune/dune-bin-install/releases/download/v1/install.sh | sh -s 3.19.1 --install-root /usr --no-update-shell-config
2117
RUN dune --version
2218

2319
# Build project

HACKING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ git clone https://github.com/<username>/OCaml.org.git
2424
cd OCaml.org
2525
```
2626

27-
Ensure you have [Dune Developer Preview](https://preview.dune.build) installed. Dune will manage the OCaml compiler along with all of the OCaml packages needed to build and run the project. By this point, we should all be using some Unix-like system (Linux, macOS, WSL2). We assume you are using the most recent version of Dune Developer Preview.
27+
Ensure you have [Dune Binary](https://github.com/ocaml-dune/dune-bin-install) installed. Dune will manage the OCaml compiler along with all of the OCaml packages needed to build and run the project. By this point, we should all be using some Unix-like system (Linux, macOS, WSL2). We assume you are using the most recent version of Dune.
2828

2929
If you would like to build using Dune installed via `opam`, make sure to remove the `dune.lock/` directories and use the same build commands present in the Makefile, skipping `dune pkg lock`.
3030

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,3 @@ scrape_changelog:
6060
.PHONY: docker
6161
docker: ## Generate docker container
6262
docker build -f Dockerfile . -t ocamlorg:latest
63-
64-
.PHONY: linkcheck
65-
linkcheck:
66-
dune exec --root . olinkcheck md data

dev-tools.locks/ocamlformat/lock.dune

Lines changed: 0 additions & 34 deletions
This file was deleted.

dev-tools.locks/ocamlformat/ocamlformat.pkg

Lines changed: 0 additions & 14 deletions
This file was deleted.

dune-project

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
syndic
6060
ounit
6161
(alcotest :with-test)
62+
(ocamlformat
63+
(and
64+
:with-test
65+
( = 0.26.2)))
6266
(mdx
6367
(and
6468
:with-test

dune-workspace

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,9 @@
44
(name pinned_opam_repository)
55
(url git+https://github.com/ocaml/opam-repository#584630e7a7e27e3cf56158696a3fe94623a0cf4f))
66

7-
(pin
8-
(name olinkcheck)
9-
(url "git+https://github.com/tarides/olinkcheck")
10-
(package
11-
(name olinkcheck)))
12-
137
(repository (name pinned_overlay_repository) (url git+https://github.com/ocaml-dune/opam-overlays#2a9543286ff0e0656058fee5c0da7abc16b8717d))
148

159
(lock_dir
1610
(repositories pinned_opam_repository pinned_overlay_repository)
17-
(pins olinkcheck)
1811
(version_preference newest)
1912
)

ocamlorg.opam

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,3 @@ build: [
7070
]
7171
]
7272
dev-repo: "git+https://github.com/ocaml/ocaml.org.git"
73-
pin-depends: [
74-
["river.dev" "git+https://github.com/aantron/river#476dc945a908a69548bddd267f143a3e5d9c8a1a"]
75-
["olinkcheck.~dev" "git+https://github.com/tarides/olinkcheck"]
76-
]

0 commit comments

Comments
 (0)