Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-dune for openSUSE:Factory
checked in at 2024-01-08 23:46:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-dune (Old)
and /work/SRC/openSUSE:Factory/.ocaml-dune.new.21961 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-dune"
Mon Jan 8 23:46:01 2024 rev:40 rq:1137513 version:3.12.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-dune/ocaml-dune.changes 2023-12-12
19:32:38.501372276 +0100
+++ /work/SRC/openSUSE:Factory/.ocaml-dune.new.21961/ocaml-dune.changes
2024-01-08 23:46:04.116070936 +0100
@@ -1,0 +2,6 @@
+Fri Jan 5 05:05:05 UTC 2024 - oher...@suse.de
+
+- Update to version 3.12.2
+ see included CHANGES.md file for details
+
+-------------------------------------------------------------------
Old:
----
ocaml-dune-3.12.1.tar.xz
New:
----
ocaml-dune-3.12.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-dune.spec ++++++
--- /var/tmp/diff_new_pack.ONYlRL/_old 2024-01-08 23:46:04.732093334 +0100
+++ /var/tmp/diff_new_pack.ONYlRL/_new 2024-01-08 23:46:04.736093479 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-dune
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
%define pkg ocaml-dune
%global _buildshell /bin/bash
Name: %pkg%nsuffix
-Version: 3.12.1
+Version: 3.12.2
Release: 0
%{?ocaml_preserve_bytecode}
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.ONYlRL/_old 2024-01-08 23:46:04.784095224 +0100
+++ /var/tmp/diff_new_pack.ONYlRL/_new 2024-01-08 23:46:04.788095370 +0100
@@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="filename">ocaml-dune</param>
- <param name="revision">2e4994f005e9a94993150601bdb60759d9de5ab6</param>
+ <param name="revision">f5be55fecd654fc097fa8990b62d5d826fa9b22f</param>
<param name="scm">git</param>
<param name="submodules">disable</param>
<param name="url">https://github.com/ocaml/dune.git</param>
++++++ ocaml-dune-3.12.1.tar.xz -> ocaml-dune-3.12.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-3.12.1/CHANGES.md
new/ocaml-dune-3.12.2/CHANGES.md
--- old/ocaml-dune-3.12.1/CHANGES.md 2023-11-29 14:08:12.000000000 +0100
+++ new/ocaml-dune-3.12.2/CHANGES.md 2024-01-05 15:17:27.000000000 +0100
@@ -1,3 +1,11 @@
+3.12.2 (2024-01-05)
+-------------------
+
+- Fix version check in `runtest_alias` for `cram` stanza (#9454, @emillon)
+
+- Fix stack overflow when a `(run)` action can not be parsed. (#9530, fixes
+ #9529, @gridbugs)
+
3.12.1 (2023-11-29)
-------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-3.12.1/ocaml-dune.changes
new/ocaml-dune-3.12.2/ocaml-dune.changes
--- old/ocaml-dune-3.12.1/ocaml-dune.changes 2023-11-29 14:08:12.000000000
+0100
+++ new/ocaml-dune-3.12.2/ocaml-dune.changes 2024-01-05 15:17:27.000000000
+0100
@@ -825,3 +825,6 @@
be192e235 [3.12] Revert #9280 (#9313)
1747993bf [3.12] Revert #9250 (#9315)
2e4994f00 (tag: 3.12.1, origin/3.12) Prepare 3.12.1 (#9316)
+fbdaa4fa5 fix: use correct version for runtest_alias in cram (#9454) (#9635)
+851de9873 [3.12] backport #9530 (slang fix) (#9636)
+f5be55fec (tag: 3.12.2, origin/3.12) prepare 3.12.2 (#9638)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-3.12.1/src/dune_lang/action.ml
new/ocaml-dune-3.12.2/src/dune_lang/action.ml
--- old/ocaml-dune-3.12.1/src/dune_lang/action.ml 2023-11-29
14:08:12.000000000 +0100
+++ new/ocaml-dune-3.12.2/src/dune_lang/action.ml 2024-01-05
15:17:27.000000000 +0100
@@ -258,15 +258,7 @@
let cstrs_dune_file t =
let open Decoder in
- [ ( "run"
- , let+ args =
- (* Although a single [Slang.t] evaluates to a list of strings,
individual
- terms of the command are represented by individual [Slang.t]s, hence
- the [repeat] below. *)
- repeat Slang.decode
- in
- Run args )
- ; "with-accepted-exit-codes", decode_with_accepted_exit_codes t
+ [ "with-accepted-exit-codes", decode_with_accepted_exit_codes t
; ( "dynamic-run"
, Syntax.since Action_plugin.syntax (0, 1)
>>> let+ prog = sw
@@ -361,7 +353,23 @@
]
;;
-let decode_dune_file = Decoder.fix @@ fun t -> Decoder.sum (cstrs_dune_file t)
+let decode_dune_file =
+ let dune_file_specific =
+ let open Decoder in
+ [ ( "run"
+ , (* In regular dune files the "run" action is parsed as a command and
+ argument list rather than with the slang dsl parser which is still
+ experimental. *)
+ let+ prog = sw
+ and+ args = repeat sw in
+ let slang =
+ Slang.Literal prog :: List.map args ~f:(fun arg -> Slang.Literal arg)
+ in
+ Run slang )
+ ]
+ in
+ Decoder.fix @@ fun t -> Decoder.sum (cstrs_dune_file t @ dune_file_specific)
+;;
let decode_pkg =
let cstrs_pkg t =
@@ -385,6 +393,14 @@
>>> let+ condition = Slang.decode_blang
and+ action = t in
When (condition, action) )
+ ; ( "run"
+ , let+ args =
+ (* Although a single [Slang.t] evaluates to a list of strings,
individual
+ terms of the command are represented by individual [Slang.t]s,
hence
+ the [repeat] below. *)
+ repeat Slang.decode
+ in
+ Run args )
]
in
Decoder.fix @@ fun t -> Decoder.sum (cstrs_dune_file t @ cstrs_pkg t)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-dune-3.12.1/src/dune_rules/cram/cram_stanza.ml
new/ocaml-dune-3.12.2/src/dune_rules/cram/cram_stanza.ml
--- old/ocaml-dune-3.12.1/src/dune_rules/cram/cram_stanza.ml 2023-11-29
14:08:12.000000000 +0100
+++ new/ocaml-dune-3.12.2/src/dune_rules/cram/cram_stanza.ml 2024-01-05
15:17:27.000000000 +0100
@@ -46,7 +46,7 @@
and+ runtest_alias =
field_o
"runtest_alias"
- (Dune_lang.Syntax.since Stanza.syntax (3, 11) >>> located bool)
+ (Dune_lang.Syntax.since Stanza.syntax (3, 12) >>> located bool)
in
{ loc; alias; deps; enabled_if; locks; applies_to; package; runtest_alias
})
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-dune-3.12.1/test/blackbox-tests/test-cases/cram/runtest_alias.t
new/ocaml-dune-3.12.2/test/blackbox-tests/test-cases/cram/runtest_alias.t
--- old/ocaml-dune-3.12.1/test/blackbox-tests/test-cases/cram/runtest_alias.t
2023-11-29 14:08:12.000000000 +0100
+++ new/ocaml-dune-3.12.2/test/blackbox-tests/test-cases/cram/runtest_alias.t
2024-01-05 15:17:27.000000000 +0100
@@ -1,7 +1,7 @@
Control the default runtest alias for cram tests
$ cat >dune-project <<EOF
- > (lang dune 3.11)
+ > (lang dune 3.12)
> EOF
$ cat >dune <<EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ocaml-dune-3.12.1/test/blackbox-tests/test-cases/run-parse-error.t
new/ocaml-dune-3.12.2/test/blackbox-tests/test-cases/run-parse-error.t
--- old/ocaml-dune-3.12.1/test/blackbox-tests/test-cases/run-parse-error.t
1970-01-01 01:00:00.000000000 +0100
+++ new/ocaml-dune-3.12.2/test/blackbox-tests/test-cases/run-parse-error.t
2024-01-05 15:17:27.000000000 +0100
@@ -0,0 +1,18 @@
+Test that parse errors in the run error produce the expected error message.
+
+See #9529.
+
+ $ echo "(lang dune 3.11)" > dune-project
+ $ cat > dune <<EOF
+ > (rule
+ > (target foo.txt)
+ > (action
+ > (run ())))
+ > EOF
+
+ $ dune build foo.txt
+ File "dune", line 4, characters 7-9:
+ 4 | (run ())))
+ ^^
+ Error: Unexpected list
+ [1]
