Skip to content

Commit bdf8ee7

Browse files
art-wLeonidas-from-XIV
authored andcommitted
Default maintenance_intent to (latest)
Signed-off-by: ArthurW <arthur@tarides.com> Signed-off-by: Marek Kubica <marek@tarides.com>
1 parent 1b4a3ad commit bdf8ee7

File tree

12 files changed

+23
-8
lines changed

12 files changed

+23
-8
lines changed

otherlibs/dune-site/test/run.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ Test with an opam like installation
169169
]
170170
["dune" "install" "-p" name "--create-install-files" name]
171171
]
172+
x-maintenance-intent: ["(latest)"]
172173

173174
$ dune build -p a --promote-install-files=false @install
174175

otherlibs/dune-site/test/run_2_9.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ Test with an opam like installation
157157
]
158158
["dune" "install" "-p" name "--create-install-files" name]
159159
]
160+
x-maintenance-intent: ["(latest)"]
160161

161162
$ dune build -p a --promote-install-files="false" @install
162163

src/dune_config_file/dune_config_file.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ module Dune_config = struct
365365
; project_defaults =
366366
{ authors = Some [ "Author Name <author@example.com>" ]
367367
; maintainers = Some [ "Maintainer Name <maintainer@example.com>" ]
368-
; maintenance_intent = Some [ "(latest)" ]
368+
; maintenance_intent = None
369369
; license = Some [ "LICENSE" ]
370370
}
371371
; experimental = []

src/dune_rules/opam_create.ml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,10 @@ let opam_fields project (package : Package.t) =
228228
in
229229
let list_fields =
230230
[ "maintainer", Package_info.maintainers info
231-
; "x-maintenance-intent", Package_info.maintenance_intent info
231+
; ( "x-maintenance-intent"
232+
, match Package_info.maintenance_intent info with
233+
| None -> Some [ "(latest)" ]
234+
| x -> x )
232235
; "authors", Package_info.authors info
233236
; ( "license"
234237
, match Package_info.license info with

test/blackbox-tests/test-cases/describe/describe.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,4 +1373,5 @@ opam file listing
13731373
\"@doc\" {with-doc}
13741374
]
13751375
]
1376+
x-maintenance-intent: [\"(latest)\"]
13761377
"))

test/blackbox-tests/test-cases/dune-init.t/run.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@ And the opam file will be generated as expected
403403
]
404404
]
405405
dev-repo: "git+https://github.com/username/reponame.git"
406+
x-maintenance-intent: ["(latest)"]
406407

407408
We can build and run the resulting executable:
408409

@@ -513,6 +514,7 @@ And the opam file will be generated as expected
513514
]
514515
]
515516
dev-repo: "git+https://github.com/username/reponame.git"
517+
x-maintenance-intent: ["(latest)"]
516518

517519
And we we can run the tests:
518520

test/blackbox-tests/test-cases/dune-package.t/run.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ Install as opam does
177177
"@doc" {with-doc}
178178
]
179179
]
180+
x-maintenance-intent: ["(latest)"]
180181

181182
$ (cd a; "dune" "build" "-p" a "@install")
182183

test/blackbox-tests/test-cases/dune-project-meta/dune-dep.t

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ the doc dependencies:
191191
]
192192
["dune" "install" "-p" name "--create-install-files" name]
193193
]
194+
x-maintenance-intent: ["(latest)"]
194195

195196
$ cat > dune-project <<EOF
196197
> (lang dune 3.0)
@@ -215,6 +216,7 @@ the doc dependencies:
215216
"@doc" {with-doc}
216217
]
217218
]
219+
x-maintenance-intent: ["(latest)"]
218220

219221
$ cat > dune-project <<EOF
220222
> (lang dune 3.0)
@@ -240,3 +242,4 @@ the doc dependencies:
240242
"@doc" {with-doc}
241243
]
242244
]
245+
x-maintenance-intent: ["(latest)"]

test/blackbox-tests/test-cases/dune-project-meta/github2927.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ Reproduction case for #2927
3030
"@doc" {with-doc}
3131
]
3232
]
33+
x-maintenance-intent: ["(latest)"]

test/blackbox-tests/test-cases/dune-project-meta/v11-1.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ Generation of opam files with lang dune >= 1.11
2929
"@doc" {with-doc}
3030
]
3131
]
32+
x-maintenance-intent: ["(latest)"]

0 commit comments

Comments
 (0)