Merge pull request #418 from poechsel/4.12-rebase

4.12 rebase

Author: mshinwell

.depend

@@ -29,9 +29,9 @@
 
 /boot/menhir/parser.ml* -diff
 
-# configure is declared as binary so that it doesn't get included in diffs.
-# This also means it will have the correct Unix line-endings, even on Windows.
-/configure binary
+# configure is a shell-script; the linguist-generated attribute suppresses
+# changes being displayed by default in pull requests.
+/configure text eol=lf -diff linguist-generated
 
 # 'union' merge driver just unions textual content in case of conflict
 #   http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/
@@ -51,19 +51,22 @@ tools/mantis2gh_stripped.csv typo.missing-header
 
 *.adoc                   typo.long-line=may
 
+# Github templates and scripts lack headers, have long lines
+/.github/**              typo.missing-header typo.long-line=may typo.very-long-line=may
+
 /.mailmap                typo.long-line typo.missing-header typo.non-ascii
 /.merlin                 typo.missing-header
 /Changes                 typo.utf8 typo.missing-header
-/News                    typo.utf8 typo.missing-header
+/release-info/News       typo.utf8 typo.missing-header
 /INSTALL                 typo.missing-header
 /LICENSE                 typo.very-long-line typo.missing-header
 # tools/ci/appveyor/appveyor_build.cmd only has missing-header because
 # dra27 too lazy to update check-typo to interpret Cmd-style comments!
 /tools/ci/appveyor/appveyor_build.cmd       typo.very-long-line typo.missing-header typo.non-ascii
 /tools/ci/appveyor/appveyor_build.sh        typo.non-ascii
-/tools/ci/inria/remove-sinh-primitive.patch typo.white-at-eol typo.missing-header typo.long-line
-/tools/release-checklist                    typo.missing-header typo.very-long-line
-
+/tools/ci/inria/bootstrap/remove-sinh-primitive.patch typo.prune
+/release-info/howto.md                    typo.missing-header typo.long-line
+/release-info/templates/*.md              typo.missing-header typo.very-long-line=may
 # ignore auto-generated .depend files
 .depend                  typo.prune
 /.depend.menhir          typo.prune
@@ -106,6 +109,7 @@ testsuite/tests/lib-unix/win-stat/fakeclock.c           typo.missing-header=fals
 testsuite/tests/misc-unsafe/almabench.ml                typo.long-line
 testsuite/tests/tool-toplevel/strings.ml                typo.utf8
 testsuite/tests/win-unicode/*.ml                        typo.utf8
+testsuite/tests/asmgen/immediates.cmm                   typo.very-long-line
 testsuite/tools/*.S                                     typo.missing-header
 testsuite/tools/*.asm                                   typo.missing-header
 testsuite/typing                                        typo.missing-header
@@ -116,6 +120,10 @@ testsuite/tests/**/*.reference               typo.prune
 # Expect tests with overly long lines of expected output
 testsuite/tests/parsing/docstrings.ml        typo.very-long-line
 
+# The normalisation tests have very specific line endings which mustn't be
+# corrupted by git.
+testsuite/tests/tool-ocamltest/norm*.reference binary
+
 tools/magic                       typo.missing-header
 tools/eventlog_metadata.in        typo.missing-header
 

.gitattributes

@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Please submit bug reports here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+<!--
+Welcome to OCaml's Issue tracker!
+
+OCaml's developers use this tracker for bugs and feature requests only, rather
+than user support.
+
+If you have questions about *using* OCaml, please ask at
+https://discuss.ocaml.org (more people read Discuss than this tracker, and
+you'll get confirmation of whether you've really found a bug or need a new
+feature).
+
+If your error came from the OCaml package manager, opam, (messages beginning
+`[ERROR] The compilation of ...`), please start at
+https://github.com/ocaml/opam-repository/issues/new.
+
+Some libraries and tools which used to be part of OCaml are now maintained
+separately. Please post questions about Graphics, Num, camlp4, LablTk, CamlDBM
+or OCamlTopWin on Discuss or on their respective issue trackers (see [README.adoc](https://github.com/ocaml/ocaml/blob/trunk/README.adoc#separately-maintained-components)
+for a full list).
+-->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,10 @@
+blank_issues_enabled: false
+contact_links:
+  - name: OCaml Discuss Forum
+    url: https://discuss.ocaml.org/
+    about: This is the best place to start with questions about using OCaml.
+  - name: opam Package Repository
+    url: https://github.com/ocaml/opam-repository/issues
+    about: >-
+      Virtually all OCaml packages are available in the opam repository - please
+      report packaging issues there.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest a new feature for OCaml.
+title: ''
+labels: 'feature-wish'
+assignees: ''
+
+---
+<!--
+Welcome to OCaml's Issue tracker!
+
+We welcome all suggestions for improvements to OCaml. It is helpful if
+discussions on new features can initially begin on our community forums
+(see https://discuss.ocaml.org and https://ocaml.org/community), mainly because
+their readership is wider than this issue tracker, and you'll get better
+feedback as to whether your suggestion is a good idea or has been considered
+before. You may even end up with volunteers to help implement it!
+
+It is often easier to propose changes to the language than it is to design those
+changes: if you are proposing an alteration to the language, please be aware
+that we may need to have a more complete proposal of how the change will be
+implemented than "It would be nice to be able to X in OCaml" (see also
+https://github.com/ocaml/RFCs)
+-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -57,7 +57,7 @@ jobs:
       id: cache
       with:
         path: ${{ github.workspace }}/install
-        key: ${{ matrix.os }}-cache-install-ocaml4111-flambda-dune213
+        key: ${{ matrix.os }}-cache-install-ocaml4120-flambda-dune213
 
     # ### STEP 1 ###
     # Get a working 4.10 statmemprof ocaml install, with dune
@@ -79,7 +79,7 @@ jobs:
       with:
         repository: 'ocaml/ocaml'
         path: 'base'
-        ref: '4.11'
+        ref: '4.12'
     # Apply ocamltest patch to 4.10 repo
     - name: Apply ocamltest patch
       if: steps.cache.outputs.cache-hit != 'true'
@@ -106,7 +106,7 @@ jobs:
       uses: actions/checkout@master
       with:
         repository: 'ocaml/dune'
-        ref: '2.1.3'
+        ref: '2.8.0'
         path: 'dune'
     # Build and install dune
     - name: Build and install dune
@@ -206,5 +206,3 @@ jobs:
     #- name: Running the testsuite
     #  working-directory: test
     #  run: cd testsuite && make list-parallel FILE=../.github/workflows/dune.list
-
-

.github/workflows/dune.yml

@@ -77,5 +77,3 @@ jobs:
     - name: Ocamltest failing logs
       if: failure()
       run: cd testsuite && make logs
-
-

.github/workflows/main.yml

@@ -1,5 +1,5 @@
 diff --git a/ocamltest/ocaml_compilers.ml b/ocamltest/ocaml_compilers.ml
-index bb3ed6ae4..c3e635ddf 100644
+index a47c2ae6f..90d62b8b7 100644
 --- a/ocamltest/ocaml_compilers.ml
 +++ b/ocamltest/ocaml_compilers.ml
 @@ -40,14 +40,20 @@ class compiler
@@ -24,10 +24,10 @@ index bb3ed6ae4..c3e635ddf 100644
    method ! reference_file env prefix =
      let default = tool#reference_file env prefix in
 diff --git a/ocamltest/ocaml_tests.ml b/ocamltest/ocaml_tests.ml
-index 964eaa2f6..acce5b1a3 100644
+index b42172d37..6cf4f6718 100644
 --- a/ocamltest/ocaml_tests.ml
 +++ b/ocamltest/ocaml_tests.ml
-@@ -22,16 +22,18 @@ open Ocaml_actions
+@@ -22,10 +22,12 @@ open Ocaml_actions
  let bytecode =
    let opt_actions =
    [
@@ -40,14 +40,7 @@ index 964eaa2f6..acce5b1a3 100644
    ] in
  {
    test_name = "bytecode";
-   test_run_by_default = true;
-   test_actions =
--  [
-+    [
-     setup_ocamlc_byte_build_env;
-     ocamlc_byte;
-     check_ocamlc_byte_output;
-@@ -43,15 +45,19 @@ let bytecode =
+@@ -43,14 +45,16 @@ let bytecode =
  let native =
    let opt_actions =
    [
@@ -63,9 +56,6 @@ index 964eaa2f6..acce5b1a3 100644
      check_ocamlopt_opt_output;
 +    run;
 +    check_program_output;
-+(*
-     compare_native_programs;
-+*)
    ] in
    {
      test_name = "native";

.github/workflows/ocamltest_dune.patch

@@ -1,30 +1,28 @@
 diff --git a/ocamltest/ocaml_tests.ml b/ocamltest/ocaml_tests.ml
-index 964eaa2f67..166277466b 100644
+index 55eaea2fa..86431559c 100644
 --- a/ocamltest/ocaml_tests.ml
 +++ b/ocamltest/ocaml_tests.ml
-@@ -22,10 +22,12 @@ open Ocaml_actions
+@@ -22,9 +22,11 @@ open Ocaml_actions
  let bytecode =
    let opt_actions =
    [
-+(*
++ (*
      setup_ocamlc_opt_build_env;
      ocamlc_opt;
      check_ocamlc_opt_output;
-     compare_bytecode_programs
-+*)
++ *)
    ] in
  {
    test_name = "bytecode";
-@@ -48,10 +50,12 @@ let native =
+@@ -47,9 +49,11 @@ let native =
      check_ocamlopt_byte_output;
      run;
      check_program_output;
-+(*
++ (*
      setup_ocamlopt_opt_build_env;
      ocamlopt_opt;
      check_ocamlopt_opt_output;
-     compare_native_programs;
-+*)
++ *)
    ] in
    {
      test_name = "native";

.github/workflows/ocamltest_makefile.patch

@@ -0,0 +1,15 @@
+name: "Close stale issues"
+on:
+  schedule:
+  - cron: "15 4 * * 1,3,5"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'This issue has been open one year with no activity.  Consequently, it is being marked with the "stale" label.  What this means is that the issue will be automatically closed in 30 days unless more comments are added or the "stale" label is removed.  Comments that provide new information on the issue are especially welcome: is it still reproducible? did it appear in other contexts? how critical is it? etc.'
+        days-before-stale: 366
+        days-before-close: 30