correct dune language version

Signed-off-by: Haochen M. Kotoi-Xie <hx@kxc.inc>
ocaml · haochenx · Jul 6, 2023 · Jul 6, 2023 · Jul 6, 2023 · Jul 6, 2023
commit c3a06f5e29cfc0960048c402e07af51770dc7fa7
diff --git a/doc/tests.rst b/doc/tests.rst
@@ -674,17 +674,14 @@ The ``cram`` stanza accepts the following fields:
 - ``deps`` - dependencies of the test
 - ``(package <package-name>)`` - attach the tests selected by this stanza to the
   specified package
-- ``(shell <shell-spec>)`` - (available since Dune 3.10) specify the shell to be
-  used when executing the commands in Cram test files. ``<shell-spec>`` can now
+- ``(shell <shell-prog> <args>..)`` - (available since Dune 3.12) specify the shell to be
+  used when executing the commands in Cram test files. ``<shell-prog>`` can now
   be one of the following values:
 
   - ``:system`` - this stipulates that the system shell (that is, what you get
     with ``/usr/bin/env sh``) should be used.  This is the default when this
     field does not present.
 
-  - ``:bash`` - this stipulates that the Bourne Again shell (that is, what you
-    get with ``/usr/bin/env bash``) should be used.
-
   - ``<dep>`` - ``<dep>`` should specify the path to an executable, which will
     be used as the shell program. :doc:`concepts/variables` will be expanded.
 

diff --git a/src/dune_lang/action.ml b/src/dune_lang/action.ml
@@ -357,7 +357,7 @@ let cstrs_dune_file t =
             fields
               (field
                  "shell"
-                 (Syntax.since Stanza.syntax (3, 10) >>> Shell_spec.decode)
+                 (Syntax.since Stanza.syntax (3, 12) >>> Shell_spec.decode)
                  ~default:Shell_spec.default)
           in
           Cram (script, shell_spec) )

diff --git a/src/dune_rules/cram/cram_stanza.ml b/src/dune_rules/cram/cram_stanza.ml
@@ -42,7 +42,7 @@ let decode =
      and+ shell =
        field
          "shell"
-         Dune_lang.Decoder.(Syntax.since Stanza.syntax (3, 10) >>> Shell_spec.decode)
+         Dune_lang.Decoder.(Syntax.since Stanza.syntax (3, 12) >>> Shell_spec.decode)
          ~default:Shell_spec.default
      and+ enabled_if = Enabled_if.decode ~allowed_vars:Any ~since:None ()
      and+ locks = Locks.field ~check:(Dune_lang.Syntax.since Stanza.syntax (2, 9)) ()

diff --git a/test/blackbox-tests/test-cases/cram/cram-action-shell-opt.t b/test/blackbox-tests/test-cases/cram/cram-action-shell-opt.t
@@ -1,6 +1,6 @@
 Check that Cram tests run without shell option specified
 
-  $ echo '(lang dune 3.10)' > dune-project
+  $ echo '(lang dune 3.12)' > dune-project
 
   $ cat > dune <<EOF
   > (rule

diff --git a/test/blackbox-tests/test-cases/cram/shell-opt-dune-lang-version.t b/test/blackbox-tests/test-cases/cram/shell-opt-dune-lang-version.t
@@ -1,6 +1,6 @@
-Check that `(shell ..)` option on `(cram ..)` stanza fail before `(lang dune 3.10)`
+Check that `(shell ..)` option on `(cram ..)` stanza fail before `(lang dune 3.12)`
 
-  $ echo '(lang dune 3.9)' > dune-project
+  $ echo '(lang dune 3.11)' > dune-project
 
   $ cat > dune <<EOF
   > (cram (shell :system))
@@ -14,13 +14,13 @@ Check that `(shell ..)` option on `(cram ..)` stanza fail before `(lang dune 3.1
   File "dune", line 1, characters 6-21:
   1 | (cram (shell :system))
             ^^^^^^^^^^^^^^^
-  Error: 'shell' is only available since version 3.10 of the dune language.
-  Please update your dune-project file to have (lang dune 3.10).
+  Error: 'shell' is only available since version 3.12 of the dune language.
+  Please update your dune-project file to have (lang dune 3.12).
   [1]
 
-Check that `(shell ..)` option on `(cram ..)` user action fail before `(lang dune 3.10)`
+Check that `(shell ..)` option on `(cram ..)` user action fail before `(lang dune 3.12)`
 
-  $ echo '(lang dune 3.9)' > dune-project
+  $ echo '(lang dune 3.11)' > dune-project
 
   $ cat > dune <<EOF
   > (rule
@@ -34,9 +34,9 @@ Check that `(shell ..)` option on `(cram ..)` user action fail before `(lang dun
   > EOF
 
   $ dune runtest -f
-  File "dune", line 3, characters 25-38:
+  File "dune", line 3, characters 25-37:
   3 |   (action (cram foo.cram (shell bash)))
-                               ^^^^^^^^^^^^^
-  Error: 'shell' is only available since version 3.10 of the dune language.
-  Please update your dune-project file to have (lang dune 3.10).
+                               ^^^^^^^^^^^^
+  Error: 'shell' is only available since version 3.12 of the dune language.
+  Please update your dune-project file to have (lang dune 3.12).
   [1]
diff --git a/test/blackbox-tests/test-cases/cram/shell-opt-zsh.t b/test/blackbox-tests/test-cases/cram/shell-opt-zsh.t
@@ -1,6 +1,6 @@
 Check that shell = %{bin:zsh} uses zsh
 
-  $ echo '(lang dune 3.10)' > dune-project
+  $ echo '(lang dune 3.12)' > dune-project
   $ cat > dune <<EOF
   > (cram (shell %{bin:zsh}))
   > EOF

diff --git a/test/blackbox-tests/test-cases/cram/shell-opt.t b/test/blackbox-tests/test-cases/cram/shell-opt.t
@@ -1,6 +1,6 @@
 Check that Cram tests run without shell option specified
 
-  $ echo '(lang dune 3.10)' > dune-project
+  $ echo '(lang dune 3.12)' > dune-project
 
   $ cat > foo.t <<EOF
   >   $ echo "foo from foo.t"