Remove unused opam_abi from test matrix

diskuv · Oct 14, 2024 · 4293cf4 · 4293cf4
1 parent 875a3bf
commit 4293cf4
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 21 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -14,6 +14,7 @@
     A `-v "$(pwd):/work"` will be the first argument for `docker_runner`, the image id will be the second argument, and the command line (which assumes `/work` is mounted) will be the remainder of the arguments.
 - Add `dkml_target_abi` to the test matrix
 - Add `dkml-target-abi-<TARGET>` and `dkml-host-abi-<HOST>` when installing `dkml-base-compiler`. Related: Remove `ocaml_options = "ocaml-option-32bit"` for `windows_x86` matrix item that was now unused in dkml-base-compiler.
+- Remove unused `opam_abi` from the test matrix.
 
 ## 2.1.3
 

diff --git a/src/logic/caching.ml b/src/logic/caching.ml
@@ -38,7 +38,6 @@ let cachekey_opambin ~read_script ~input:_ ~matrix =
         Digest.string script |> Digest.to_hex |> String.with_range ~len:6;
         matrix "dkml_host_abi";
         matrix "dkml_target_abi";
-        matrix "opam_abi";
       ]
 
 let cachekey_vsstudio ~input:_ ~matrix =

diff --git a/src/logic/model.ml b/src/logic/model.ml
@@ -265,7 +265,6 @@ let matrix =
       ("msys2_system", Jg_types.Tstr {|MINGW32|});
       ("msys2_packages", Jg_types.Tstr {|mingw-w64-i686-pkg-config|});
       ("exe_ext", Jg_types.Tstr {|.exe|});
-      ("opam_abi", Jg_types.Tstr {|windows_x86|});
       ("dkml_host_abi", Jg_types.Tstr {|windows_x86|});
       ("dkml_target_abi", Jg_types.Tstr {|windows_x86|});
       ("gh_opam_root", Jg_types.Tstr {|D:/.opam|});
@@ -282,7 +281,6 @@ let matrix =
       ("msys2_system", Jg_types.Tstr {|CLANG64|});
       ("msys2_packages", Jg_types.Tstr {|mingw-w64-clang-x86_64-pkg-config|});
       ("exe_ext", Jg_types.Tstr {|.exe|});
-      ("opam_abi", Jg_types.Tstr {|windows_x86_64|});
       ("dkml_host_abi", Jg_types.Tstr {|windows_x86_64|});
       ("dkml_target_abi", Jg_types.Tstr {|windows_x86_64|});
       ("gh_opam_root", Jg_types.Tstr {|D:/.opam|});
@@ -534,13 +532,11 @@ end
         { name: "msys2_system", value: 'MINGW32' },
         { name: "msys2_packages", value: 'mingw-w64-i686-pkg-config' },
         { name: "exe_ext", value: '.exe' },
-        { name: "opam_abi", value: 'windows_x86' },
         { name: "dkml_host_abi", value: 'windows_x86' },
         { name: "dkml_target_abi", value: 'windows_x86' },
         { name: "opam_root", value: '${CI_PROJECT_DIR}/.ci/o' },
         { name: "vsstudio_hostarch", value: 'x64' },
         { name: "vsstudio_arch", value: 'x86' },
-        { name: "ocaml_options", value: 'ocaml-option-32bit' },
         ...
       ],
       dkml_host_abi: "windows_x86",
@@ -600,13 +596,11 @@ let full_matrix_as_list ?must_support_gl ?must_support_gh ~allow_dkml_host_abi
       msys2_system: 'MINGW32',
       msys2_packages: 'mingw-w64-i686-pkg-config',
       exe_ext: '.exe',
-      opam_abi: 'windows_x86',
       dkml_host_abi: 'windows_x86',
       dkml_target_abi: 'windows_x86',
       opam_root: '${CI_PROJECT_DIR}/.ci/o',
       vsstudio_hostarch: 'x64',
-      vsstudio_arch: 'x86',
-      ocaml_options: 'ocaml-option-32bit' }
+      vsstudio_arch: 'x86' }
   v}
 *)
 let vars_as_object ?must_support_gl ?must_support_gh ~allow_dkml_host_abi

diff --git a/test/gh-darwin/pre/action.yml b/test/gh-darwin/pre/action.yml
@@ -1807,7 +1807,7 @@ runs:
       shell: bash
       run: |
         set -x
-        echo '4c3ac2-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.dkml_target_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}' > .ci/sd4/cachekey.opam.binaries
+        echo '4c3ac2-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.dkml_target_abi }}' > .ci/sd4/cachekey.opam.binaries
         echo '${{ steps.full_matrix_vars.outputs.abi_pattern }}-${{ steps.full_matrix_vars.outputs.vsstudio_arch }}-${{ steps.full_matrix_vars.outputs.vsstudio_hostarch }}-${{ steps.full_matrix_vars.outputs.vsstudio_dir }}-${{ steps.full_matrix_vars.outputs.vsstudio_vcvarsver }}-${{ steps.full_matrix_vars.outputs.vsstudio_winsdkver }}-${{ steps.full_matrix_vars.outputs.vsstudio_msvspreference }}-${{ steps.full_matrix_vars.outputs.vsstudio_cmakegenerator }}' > .ci/sd4/cachekey.vsstudio
         echo '${{ inputs.OCAML_COMPILER }}-${{ inputs.DISKUV_OPAM_REPOSITORY }}-${{ inputs.DKML_COMPILER }}-${{ inputs.CONF_DKML_CROSS_TOOLCHAIN }}' > .ci/sd4/cachekey.ci.inputs
 

diff --git a/test/gh-linux/pre/action.yml b/test/gh-linux/pre/action.yml
@@ -1833,7 +1833,7 @@ runs:
       shell: bash
       run: |
         set -x
-        echo '4c3ac2-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.dkml_target_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}' > .ci/sd4/cachekey.opam.binaries
+        echo '4c3ac2-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.dkml_target_abi }}' > .ci/sd4/cachekey.opam.binaries
         echo '${{ steps.full_matrix_vars.outputs.abi_pattern }}-${{ steps.full_matrix_vars.outputs.vsstudio_arch }}-${{ steps.full_matrix_vars.outputs.vsstudio_hostarch }}-${{ steps.full_matrix_vars.outputs.vsstudio_dir }}-${{ steps.full_matrix_vars.outputs.vsstudio_vcvarsver }}-${{ steps.full_matrix_vars.outputs.vsstudio_winsdkver }}-${{ steps.full_matrix_vars.outputs.vsstudio_msvspreference }}-${{ steps.full_matrix_vars.outputs.vsstudio_cmakegenerator }}' > .ci/sd4/cachekey.vsstudio
         echo '${{ inputs.OCAML_COMPILER }}-${{ inputs.DISKUV_OPAM_REPOSITORY }}-${{ inputs.DKML_COMPILER }}-${{ inputs.CONF_DKML_CROSS_TOOLCHAIN }}' > .ci/sd4/cachekey.ci.inputs
 

diff --git a/test/gh-windows/post/action.yml b/test/gh-windows/post/action.yml
@@ -35,7 +35,6 @@ runs:
           msys2_system='MINGW32';
           msys2_packages='mingw-w64-i686-pkg-config';
           exe_ext='.exe';
-          opam_abi='windows_x86';
           dkml_host_abi='windows_x86';
           dkml_target_abi='windows_x86';
           opam_root='D:/.opam';
@@ -51,7 +50,6 @@ runs:
           msys2_system='CLANG64';
           msys2_packages='mingw-w64-clang-x86_64-pkg-config';
           exe_ext='.exe';
-          opam_abi='windows_x86_64';
           dkml_host_abi='windows_x86_64';
           dkml_target_abi='windows_x86_64';
           opam_root='D:/.opam';

diff --git a/test/gh-windows/pre/action.yml b/test/gh-windows/pre/action.yml
@@ -76,7 +76,6 @@ runs:
           msys2_system='MINGW32';
           msys2_packages='mingw-w64-i686-pkg-config';
           exe_ext='.exe';
-          opam_abi='windows_x86';
           dkml_host_abi='windows_x86';
           dkml_target_abi='windows_x86';
           opam_root='D:/.opam';
@@ -92,7 +91,6 @@ runs:
           msys2_system='CLANG64';
           msys2_packages='mingw-w64-clang-x86_64-pkg-config';
           exe_ext='.exe';
-          opam_abi='windows_x86_64';
           dkml_host_abi='windows_x86_64';
           dkml_target_abi='windows_x86_64';
           opam_root='D:/.opam';
@@ -2006,7 +2004,7 @@ runs:
       shell: bash
       run: |
         set -x
-        echo '4c3ac2-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.dkml_target_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}' > .ci/sd4/cachekey.opam.binaries
+        echo '4c3ac2-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.dkml_target_abi }}' > .ci/sd4/cachekey.opam.binaries
         echo '${{ steps.full_matrix_vars.outputs.abi_pattern }}-${{ steps.full_matrix_vars.outputs.vsstudio_arch }}-${{ steps.full_matrix_vars.outputs.vsstudio_hostarch }}-${{ steps.full_matrix_vars.outputs.vsstudio_dir }}-${{ steps.full_matrix_vars.outputs.vsstudio_vcvarsver }}-${{ steps.full_matrix_vars.outputs.vsstudio_winsdkver }}-${{ steps.full_matrix_vars.outputs.vsstudio_msvspreference }}-${{ steps.full_matrix_vars.outputs.vsstudio_cmakegenerator }}' > .ci/sd4/cachekey.vsstudio
         echo '${{ inputs.OCAML_COMPILER }}-${{ inputs.DISKUV_OPAM_REPOSITORY }}-${{ inputs.DKML_COMPILER }}-${{ inputs.CONF_DKML_CROSS_TOOLCHAIN }}' > .ci/sd4/cachekey.ci.inputs
 

diff --git a/test/gl/setup-dkml.gitlab-ci.yml b/test/gl/setup-dkml.gitlab-ci.yml
@@ -2346,7 +2346,6 @@ variables:
       msys2_system: 'MINGW32',
       msys2_packages: 'mingw-w64-i686-pkg-config',
       exe_ext: '.exe',
-      opam_abi: 'windows_x86',
       dkml_host_abi: 'windows_x86',
       dkml_target_abi: 'windows_x86',
       opam_root: 'C:/o',
@@ -2366,7 +2365,6 @@ variables:
       msys2_system: 'CLANG64',
       msys2_packages: 'mingw-w64-clang-x86_64-pkg-config',
       exe_ext: '.exe',
-      opam_abi: 'windows_x86_64',
       dkml_host_abi: 'windows_x86_64',
       dkml_target_abi: 'windows_x86_64',
       opam_root: 'C:/o',
@@ -2388,7 +2386,6 @@ variables:
         msys2_system: 'MINGW32',
         msys2_packages: 'mingw-w64-i686-pkg-config',
         exe_ext: '.exe',
-        opam_abi: 'windows_x86',
         dkml_host_abi: 'windows_x86',
         dkml_target_abi: 'windows_x86',
         opam_root: 'C:/o',
@@ -2401,7 +2398,6 @@ variables:
         msys2_system: 'CLANG64',
         msys2_packages: 'mingw-w64-clang-x86_64-pkg-config',
         exe_ext: '.exe',
-        opam_abi: 'windows_x86_64',
         dkml_host_abi: 'windows_x86_64',
         dkml_target_abi: 'windows_x86_64',
         opam_root: 'C:/o',

diff --git a/test/pc/setup-dkml-windows_x86.ps1 b/test/pc/setup-dkml-windows_x86.ps1
@@ -898,7 +898,6 @@ $env:abi_pattern = "win32-windows_x86"
 $env:msys2_system = "MINGW32"
 $env:msys2_packages = "mingw-w64-i686-pkg-config"
 $env:exe_ext = ".exe"
-$env:opam_abi = "windows_x86"
 $env:dkml_host_abi = "windows_x86"
 $env:dkml_target_abi = "windows_x86"
 $env:opam_root = "${env:PC_PROJECT_DIR}/.ci/o"

diff --git a/test/pc/setup-dkml-windows_x86_64.ps1 b/test/pc/setup-dkml-windows_x86_64.ps1
@@ -898,7 +898,6 @@ $env:abi_pattern = "win32-windows_x86_64"
 $env:msys2_system = "CLANG64"
 $env:msys2_packages = "mingw-w64-clang-x86_64-pkg-config"
 $env:exe_ext = ".exe"
-$env:opam_abi = "windows_x86_64"
 $env:dkml_host_abi = "windows_x86_64"
 $env:dkml_target_abi = "windows_x86_64"
 $env:opam_root = "${env:PC_PROJECT_DIR}/.ci/o"