Update workflow

Author: poechsel

.github/workflows/dune.yml

@@ -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/ocamltest_dune.patch

@@ -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_makefile.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/testsuite_makefile.patch

@@ -1,9 +1,9 @@
 diff --git a/testsuite/Makefile b/testsuite/Makefile
-index 5abbc8356b..fa3c3805b1 100644
+index b27c66990..e9e6870dc 100644
 --- a/testsuite/Makefile
 +++ b/testsuite/Makefile
-@@ -173,7 +173,7 @@ list: lib tools
- 	@$(MAKE) report
+@@ -196,7 +196,7 @@ list: lib tools
+ 	@$(MAKE) --no-print-directory one LIST="$(FILE)"
 
  .PHONY: list-parallel
 -list-parallel: lib tools