Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 0 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ jobs:
cache-readonly: ${{ github.ref != 'refs/heads/main' }}
steps: install-dune enable-pkg lazy-update-depexts install-gpatch install-depexts

# Setting implicit_transitive_deps based on the compiler version.
- name: Edit dune-project
run: sed -i 's/(implicit_transitive_deps [^)]*)/(implicit_transitive_deps false)/' dune-project

- name: Build and Run tests
run: |
rm -rf _build/default/
Expand All @@ -77,10 +73,5 @@ jobs:
- name: Lint dunolint
run: ./dunolint.sh

# Before checking for uncommitted changes we need to restore changes
# potentially made to the dune-project file.
- name: Restore dune-project
run: git restore dune-project

- name: Check for uncommitted changes
run: git diff --exit-code
22 changes: 6 additions & 16 deletions dune-project
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(lang dune 3.17)
(lang dune 3.20)

(name dunolint)

Expand All @@ -15,17 +15,7 @@

(documentation "https://mbarbin.github.io/dunolint/")

;; The value for the [implicit_transitive_deps] option is set during the CI
;; depending on the OCaml compiler version.
;;
;; This will be set to [false] iif [ocaml-version >= 5.2].
;;
;; For packaging purposes with older ocaml, it is simpler atm if the option is
;; set to [true] in the main branch.
;;
;; See: [.github/workflows/edit_dune_project_dot_ml].

(implicit_transitive_deps true)
(implicit_transitive_deps false-if-hidden-includes-supported)

(package
(name dunolint-lib)
Expand All @@ -34,7 +24,7 @@
(ocaml
(>= 4.14))
(dyn
(>= 3.17))
(>= 3.20))
(re
(>= 1.8.0))
(sexplib0
Expand Down Expand Up @@ -62,11 +52,11 @@
(cmdlang-cmdliner-err-runner
(>= 0.0.16))
(dune-build-info
(>= 3.17))
(>= 3.20))
(dunolint-lib
(= :version))
(dyn
(>= 3.17))
(>= 3.20))
(file-rewriter
(>= 0.0.3))
(fmt
Expand All @@ -80,7 +70,7 @@
(logs
(>= 0.7.0))
(ordering
(>= 3.17))
(>= 3.20))
(pageantty
(>= 0.0.3))
(parsexp
Expand Down
3 changes: 2 additions & 1 deletion dunolint-dev.opam
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ doc: "https://mbarbin.github.io/dunolint/"
bug-reports: "https://github.com/mbarbin/dunolint/issues"
depends: [
"ocaml" {>= "5.3"}
"dune" {>= "3.17" & >= "3.20"}
"dune" {>= "3.20" & >= "3.20"}
"ocamlformat" {= "0.29.0"}
"bisect_ppx" {>= "2.8.3"}
"dunolint" {= version}
Expand Down Expand Up @@ -41,3 +41,4 @@ build: [
]
]
dev-repo: "git+https://github.com/mbarbin/dunolint.git"
x-maintenance-intent: ["(latest)"]
3 changes: 2 additions & 1 deletion dunolint-lib-base-tests.opam
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ homepage: "https://github.com/mbarbin/dunolint"
doc: "https://mbarbin.github.io/dunolint/"
bug-reports: "https://github.com/mbarbin/dunolint/issues"
depends: [
"dune" {>= "3.17"}
"dune" {>= "3.20"}
"ocaml" {>= "5.3"}
"dunolint-lib" {= version}
"dunolint-lib-base" {= version}
Expand All @@ -30,3 +30,4 @@ build: [
]
]
dev-repo: "git+https://github.com/mbarbin/dunolint.git"
x-maintenance-intent: ["(latest)"]
3 changes: 2 additions & 1 deletion dunolint-lib-base.opam
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ homepage: "https://github.com/mbarbin/dunolint"
doc: "https://mbarbin.github.io/dunolint/"
bug-reports: "https://github.com/mbarbin/dunolint/issues"
depends: [
"dune" {>= "3.17"}
"dune" {>= "3.20"}
"ocaml" {>= "4.14"}
"base" {>= "v0.16"}
"dunolint-lib" {= version}
Expand All @@ -29,3 +29,4 @@ build: [
]
]
dev-repo: "git+https://github.com/mbarbin/dunolint.git"
x-maintenance-intent: ["(latest)"]
4 changes: 2 additions & 2 deletions dunolint-lib.opam
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ homepage: "https://github.com/mbarbin/dunolint"
doc: "https://mbarbin.github.io/dunolint/"
bug-reports: "https://github.com/mbarbin/dunolint/issues"
depends: [
"dune" {>= "3.17"}
"dune" {>= "3.20"}
"ocaml" {>= "4.14"}
"dyn" {>= "3.17"}
"dyn" {>= "3.20"}
"re" {>= "1.8.0"}
"sexplib0" {>= "v0.16"}
"odoc" {with-doc}
Expand Down
3 changes: 2 additions & 1 deletion dunolint-tests.opam
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ doc: "https://mbarbin.github.io/dunolint/"
bug-reports: "https://github.com/mbarbin/dunolint/issues"
depends: [
"ocaml" {>= "5.3"}
"dune" {>= "3.17" & >= "3.20"}
"dune" {>= "3.20" & >= "3.20"}
"cmdlang" {>= "0.0.9"}
"cmdlang-cmdliner-err-runner" {>= "0.0.16"}
"cmdlang-stdlib-runner" {>= "0.0.9"}
Expand Down Expand Up @@ -55,3 +55,4 @@ build: [
]
]
dev-repo: "git+https://github.com/mbarbin/dunolint.git"
x-maintenance-intent: ["(latest)"]
8 changes: 4 additions & 4 deletions dunolint.opam
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ homepage: "https://github.com/mbarbin/dunolint"
doc: "https://mbarbin.github.io/dunolint/"
bug-reports: "https://github.com/mbarbin/dunolint/issues"
depends: [
"dune" {>= "3.17"}
"dune" {>= "3.20"}
"ocaml" {>= "5.3"}
"cmdlang" {>= "0.0.9"}
"cmdlang-cmdliner-err-runner" {>= "0.0.16"}
"dune-build-info" {>= "3.17"}
"dune-build-info" {>= "3.20"}
"dunolint-lib" {= version}
"dyn" {>= "3.17"}
"dyn" {>= "3.20"}
"file-rewriter" {>= "0.0.3"}
"fmt" {>= "0.9.0"}
"fpath" {>= "0.7.3"}
"fpath-sexp0" {>= "0.4.0"}
"loc" {>= "0.3.3"}
"logs" {>= "0.7.0"}
"ordering" {>= "3.17"}
"ordering" {>= "3.20"}
"pageantty" {>= "0.0.3"}
"parsexp" {>= "v0.17"}
"pp" {>= "2.0.0"}
Expand Down