diff --git a/src/logic/model.ml b/src/logic/model.ml index 3f7df4cd..cf6c4575 100755 --- a/src/logic/model.ml +++ b/src/logic/model.ml @@ -46,8 +46,15 @@ let global_env_vars = ("PIN_DKML_COMPONENT_COMMON_DESKTOP", "2.0.3"); ("PIN_DKML_COMPONENT_COMMON_OPAM", "2.2.0~alpha0~20221228"); ("PIN_DKML_COMPONENT_COMMON_UNIXUTILS", "0.2.0"); + ("PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON", "4.14.0~v2.0.3"); + ("PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK", "4.14.0~v2.0.3"); + ("PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE", "4.14.0~v2.0.3"); + ("PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL", "2.0.3"); + ("PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM", "2.2.0~alpha0~20221228"); + ("PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS", "0.2.0"); ("PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL", "2.0.3"); ("PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR", "2.0.3"); + ("PIN_DKML_COMPONENT_STAGING_OCAMLRUN", "4.14.0~v2.0.3"); ("PIN_DKML_COMPONENT_STAGING_OPAM32", "2.2.0~alpha0~20221228"); ("PIN_DKML_COMPONENT_STAGING_OPAM64", "2.2.0~alpha0~20221228"); ("PIN_DKML_COMPONENT_STAGING_UNIXUTILS", "0.2.0"); @@ -59,6 +66,7 @@ let global_env_vars = ("PIN_DKML_INSTALL_RUNNER", "0.5.1"); ("PIN_DKML_INSTALL", "0.5.1"); ("PIN_DKML_INSTALLER_OCAML_COMMON", "2.0.3"); + ("PIN_DKML_INSTALLER_OCAML_OFFLINE", "2.0.3"); ("PIN_DKML_PACKAGE_CONSOLE", "0.5.1"); ("PIN_DKML_RUNTIME_COMMON_NATIVE", "2.0.3"); ("PIN_DKML_RUNTIME_COMMON", "2.0.3"); diff --git a/src/scripts/setup-dkml.sh b/src/scripts/setup-dkml.sh index 8fbb3c6d..9e5dde11 100755 --- a/src/scripts/setup-dkml.sh +++ b/src/scripts/setup-dkml.sh @@ -938,8 +938,15 @@ do_pins() { opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-desktop "${PIN_DKML_COMPONENT_COMMON_DESKTOP}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-opam "${PIN_DKML_COMPONENT_COMMON_OPAM}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-unixutils "${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-common "${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-network "${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-offline "${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-desktop-full "${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-opamshim "${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-unixutils "${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-desktop-full "${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-dkmlconfdir "${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-ocamlrun "${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam32 "${PIN_DKML_COMPONENT_STAGING_OPAM32}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam64 "${PIN_DKML_COMPONENT_STAGING_OPAM64}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-unixutils "${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" @@ -951,6 +958,7 @@ do_pins() { opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-installer "${PIN_DKML_INSTALL_INSTALLER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-runner "${PIN_DKML_INSTALL_RUNNER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-common "${PIN_DKML_INSTALLER_OCAML_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-offline "${PIN_DKML_INSTALLER_OCAML_OFFLINE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-package-console "${PIN_DKML_PACKAGE_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common "${PIN_DKML_RUNTIME_COMMON}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common-native "${PIN_DKML_RUNTIME_COMMON_NATIVE}" diff --git a/test/gh-darwin/post/action.yml b/test/gh-darwin/post/action.yml index 6f9c3c0a..fd7ead11 100644 --- a/test/gh-darwin/post/action.yml +++ b/test/gh-darwin/post/action.yml @@ -83,8 +83,15 @@ runs: PIN_DKML_COMPONENT_COMMON_DESKTOP: '2.0.3' PIN_DKML_COMPONENT_COMMON_OPAM: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_COMMON_UNIXUTILS: '0.2.0' + PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL: '2.0.3' + PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM: '2.2.0~alpha0~20221228' + PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS: '0.2.0' PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL: '2.0.3' PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR: '2.0.3' + PIN_DKML_COMPONENT_STAGING_OCAMLRUN: '4.14.0~v2.0.3' PIN_DKML_COMPONENT_STAGING_OPAM32: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_STAGING_OPAM64: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_STAGING_UNIXUTILS: '0.2.0' @@ -96,6 +103,7 @@ runs: PIN_DKML_INSTALL_RUNNER: '0.5.1' PIN_DKML_INSTALL: '0.5.1' PIN_DKML_INSTALLER_OCAML_COMMON: '2.0.3' + PIN_DKML_INSTALLER_OCAML_OFFLINE: '2.0.3' PIN_DKML_PACKAGE_CONSOLE: '0.5.1' PIN_DKML_RUNTIME_COMMON_NATIVE: '2.0.3' PIN_DKML_RUNTIME_COMMON: '2.0.3' diff --git a/test/gh-darwin/pre/action.yml b/test/gh-darwin/pre/action.yml index be497258..b29a61b8 100644 --- a/test/gh-darwin/pre/action.yml +++ b/test/gh-darwin/pre/action.yml @@ -1268,8 +1268,15 @@ runs: opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-desktop "${PIN_DKML_COMPONENT_COMMON_DESKTOP}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-opam "${PIN_DKML_COMPONENT_COMMON_OPAM}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-unixutils "${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-common "${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-network "${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-offline "${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-desktop-full "${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-opamshim "${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-unixutils "${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-desktop-full "${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-dkmlconfdir "${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-ocamlrun "${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam32 "${PIN_DKML_COMPONENT_STAGING_OPAM32}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam64 "${PIN_DKML_COMPONENT_STAGING_OPAM64}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-unixutils "${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" @@ -1281,6 +1288,7 @@ runs: opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-installer "${PIN_DKML_INSTALL_INSTALLER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-runner "${PIN_DKML_INSTALL_RUNNER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-common "${PIN_DKML_INSTALLER_OCAML_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-offline "${PIN_DKML_INSTALLER_OCAML_OFFLINE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-package-console "${PIN_DKML_PACKAGE_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common "${PIN_DKML_RUNTIME_COMMON}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common-native "${PIN_DKML_RUNTIME_COMMON_NATIVE}" @@ -1759,7 +1767,7 @@ runs: shell: bash run: | set -x - echo 'f770dc-${{ inputs.FDOPEN_OPAMEXE_BOOTSTRAP }}-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}-${{ steps.full_matrix_vars.outputs.bootstrap_opam_version }}' > .ci/sd4/cachekey.opam.binaries + echo '6f60da-${{ inputs.FDOPEN_OPAMEXE_BOOTSTRAP }}-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}-${{ steps.full_matrix_vars.outputs.bootstrap_opam_version }}' > .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 @@ -1859,8 +1867,15 @@ runs: PIN_DKML_COMPONENT_COMMON_DESKTOP: '2.0.3' PIN_DKML_COMPONENT_COMMON_OPAM: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_COMMON_UNIXUTILS: '0.2.0' + PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL: '2.0.3' + PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM: '2.2.0~alpha0~20221228' + PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS: '0.2.0' PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL: '2.0.3' PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR: '2.0.3' + PIN_DKML_COMPONENT_STAGING_OCAMLRUN: '4.14.0~v2.0.3' PIN_DKML_COMPONENT_STAGING_OPAM32: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_STAGING_OPAM64: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_STAGING_UNIXUTILS: '0.2.0' @@ -1872,6 +1887,7 @@ runs: PIN_DKML_INSTALL_RUNNER: '0.5.1' PIN_DKML_INSTALL: '0.5.1' PIN_DKML_INSTALLER_OCAML_COMMON: '2.0.3' + PIN_DKML_INSTALLER_OCAML_OFFLINE: '2.0.3' PIN_DKML_PACKAGE_CONSOLE: '0.5.1' PIN_DKML_RUNTIME_COMMON_NATIVE: '2.0.3' PIN_DKML_RUNTIME_COMMON: '2.0.3' diff --git a/test/gh-linux/post/action.yml b/test/gh-linux/post/action.yml index 5f81143a..f2fc59e1 100644 --- a/test/gh-linux/post/action.yml +++ b/test/gh-linux/post/action.yml @@ -99,8 +99,15 @@ runs: PIN_DKML_COMPONENT_COMMON_DESKTOP: '2.0.3' PIN_DKML_COMPONENT_COMMON_OPAM: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_COMMON_UNIXUTILS: '0.2.0' + PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL: '2.0.3' + PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM: '2.2.0~alpha0~20221228' + PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS: '0.2.0' PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL: '2.0.3' PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR: '2.0.3' + PIN_DKML_COMPONENT_STAGING_OCAMLRUN: '4.14.0~v2.0.3' PIN_DKML_COMPONENT_STAGING_OPAM32: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_STAGING_OPAM64: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_STAGING_UNIXUTILS: '0.2.0' @@ -112,6 +119,7 @@ runs: PIN_DKML_INSTALL_RUNNER: '0.5.1' PIN_DKML_INSTALL: '0.5.1' PIN_DKML_INSTALLER_OCAML_COMMON: '2.0.3' + PIN_DKML_INSTALLER_OCAML_OFFLINE: '2.0.3' PIN_DKML_PACKAGE_CONSOLE: '0.5.1' PIN_DKML_RUNTIME_COMMON_NATIVE: '2.0.3' PIN_DKML_RUNTIME_COMMON: '2.0.3' diff --git a/test/gh-linux/pre/action.yml b/test/gh-linux/pre/action.yml index 2dcd2b25..9cd79cd5 100644 --- a/test/gh-linux/pre/action.yml +++ b/test/gh-linux/pre/action.yml @@ -1296,8 +1296,15 @@ runs: opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-desktop "${PIN_DKML_COMPONENT_COMMON_DESKTOP}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-opam "${PIN_DKML_COMPONENT_COMMON_OPAM}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-unixutils "${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-common "${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-network "${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-offline "${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-desktop-full "${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-opamshim "${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-unixutils "${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-desktop-full "${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-dkmlconfdir "${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-ocamlrun "${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam32 "${PIN_DKML_COMPONENT_STAGING_OPAM32}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam64 "${PIN_DKML_COMPONENT_STAGING_OPAM64}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-unixutils "${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" @@ -1309,6 +1316,7 @@ runs: opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-installer "${PIN_DKML_INSTALL_INSTALLER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-runner "${PIN_DKML_INSTALL_RUNNER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-common "${PIN_DKML_INSTALLER_OCAML_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-offline "${PIN_DKML_INSTALLER_OCAML_OFFLINE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-package-console "${PIN_DKML_PACKAGE_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common "${PIN_DKML_RUNTIME_COMMON}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common-native "${PIN_DKML_RUNTIME_COMMON_NATIVE}" @@ -1787,7 +1795,7 @@ runs: shell: bash run: | set -x - echo 'f770dc-${{ inputs.FDOPEN_OPAMEXE_BOOTSTRAP }}-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}-${{ steps.full_matrix_vars.outputs.bootstrap_opam_version }}' > .ci/sd4/cachekey.opam.binaries + echo '6f60da-${{ inputs.FDOPEN_OPAMEXE_BOOTSTRAP }}-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}-${{ steps.full_matrix_vars.outputs.bootstrap_opam_version }}' > .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 @@ -1918,8 +1926,15 @@ runs: PIN_DKML_COMPONENT_COMMON_DESKTOP: '2.0.3' PIN_DKML_COMPONENT_COMMON_OPAM: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_COMMON_UNIXUTILS: '0.2.0' + PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL: '2.0.3' + PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM: '2.2.0~alpha0~20221228' + PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS: '0.2.0' PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL: '2.0.3' PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR: '2.0.3' + PIN_DKML_COMPONENT_STAGING_OCAMLRUN: '4.14.0~v2.0.3' PIN_DKML_COMPONENT_STAGING_OPAM32: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_STAGING_OPAM64: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_STAGING_UNIXUTILS: '0.2.0' @@ -1931,6 +1946,7 @@ runs: PIN_DKML_INSTALL_RUNNER: '0.5.1' PIN_DKML_INSTALL: '0.5.1' PIN_DKML_INSTALLER_OCAML_COMMON: '2.0.3' + PIN_DKML_INSTALLER_OCAML_OFFLINE: '2.0.3' PIN_DKML_PACKAGE_CONSOLE: '0.5.1' PIN_DKML_RUNTIME_COMMON_NATIVE: '2.0.3' PIN_DKML_RUNTIME_COMMON: '2.0.3' diff --git a/test/gh-windows/post/action.yml b/test/gh-windows/post/action.yml index bfc67766..4f1c289d 100644 --- a/test/gh-windows/post/action.yml +++ b/test/gh-windows/post/action.yml @@ -112,8 +112,15 @@ runs: PIN_DKML_COMPONENT_COMMON_DESKTOP: '2.0.3' PIN_DKML_COMPONENT_COMMON_OPAM: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_COMMON_UNIXUTILS: '0.2.0' + PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL: '2.0.3' + PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM: '2.2.0~alpha0~20221228' + PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS: '0.2.0' PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL: '2.0.3' PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR: '2.0.3' + PIN_DKML_COMPONENT_STAGING_OCAMLRUN: '4.14.0~v2.0.3' PIN_DKML_COMPONENT_STAGING_OPAM32: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_STAGING_OPAM64: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_STAGING_UNIXUTILS: '0.2.0' @@ -125,6 +132,7 @@ runs: PIN_DKML_INSTALL_RUNNER: '0.5.1' PIN_DKML_INSTALL: '0.5.1' PIN_DKML_INSTALLER_OCAML_COMMON: '2.0.3' + PIN_DKML_INSTALLER_OCAML_OFFLINE: '2.0.3' PIN_DKML_PACKAGE_CONSOLE: '0.5.1' PIN_DKML_RUNTIME_COMMON_NATIVE: '2.0.3' PIN_DKML_RUNTIME_COMMON: '2.0.3' diff --git a/test/gh-windows/pre/action.yml b/test/gh-windows/pre/action.yml index 11c829a8..4f222bf5 100644 --- a/test/gh-windows/pre/action.yml +++ b/test/gh-windows/pre/action.yml @@ -1329,8 +1329,15 @@ runs: opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-desktop "${PIN_DKML_COMPONENT_COMMON_DESKTOP}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-opam "${PIN_DKML_COMPONENT_COMMON_OPAM}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-unixutils "${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-common "${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-network "${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-offline "${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-desktop-full "${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-opamshim "${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-unixutils "${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-desktop-full "${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-dkmlconfdir "${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-ocamlrun "${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam32 "${PIN_DKML_COMPONENT_STAGING_OPAM32}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam64 "${PIN_DKML_COMPONENT_STAGING_OPAM64}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-unixutils "${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" @@ -1342,6 +1349,7 @@ runs: opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-installer "${PIN_DKML_INSTALL_INSTALLER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-runner "${PIN_DKML_INSTALL_RUNNER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-common "${PIN_DKML_INSTALLER_OCAML_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-offline "${PIN_DKML_INSTALLER_OCAML_OFFLINE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-package-console "${PIN_DKML_PACKAGE_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common "${PIN_DKML_RUNTIME_COMMON}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common-native "${PIN_DKML_RUNTIME_COMMON_NATIVE}" @@ -1958,7 +1966,7 @@ runs: shell: bash run: | set -x - echo 'f770dc-${{ inputs.FDOPEN_OPAMEXE_BOOTSTRAP }}-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}-${{ steps.full_matrix_vars.outputs.bootstrap_opam_version }}' > .ci/sd4/cachekey.opam.binaries + echo '6f60da-${{ inputs.FDOPEN_OPAMEXE_BOOTSTRAP }}-${{ steps.full_matrix_vars.outputs.dkml_host_abi }}-${{ steps.full_matrix_vars.outputs.opam_abi }}-${{ steps.full_matrix_vars.outputs.bootstrap_opam_version }}' > .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 @@ -2090,8 +2098,15 @@ runs: PIN_DKML_COMPONENT_COMMON_DESKTOP: '2.0.3' PIN_DKML_COMPONENT_COMMON_OPAM: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_COMMON_UNIXUTILS: '0.2.0' + PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL: '2.0.3' + PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM: '2.2.0~alpha0~20221228' + PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS: '0.2.0' PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL: '2.0.3' PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR: '2.0.3' + PIN_DKML_COMPONENT_STAGING_OCAMLRUN: '4.14.0~v2.0.3' PIN_DKML_COMPONENT_STAGING_OPAM32: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_STAGING_OPAM64: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_STAGING_UNIXUTILS: '0.2.0' @@ -2103,6 +2118,7 @@ runs: PIN_DKML_INSTALL_RUNNER: '0.5.1' PIN_DKML_INSTALL: '0.5.1' PIN_DKML_INSTALLER_OCAML_COMMON: '2.0.3' + PIN_DKML_INSTALLER_OCAML_OFFLINE: '2.0.3' PIN_DKML_PACKAGE_CONSOLE: '0.5.1' PIN_DKML_RUNTIME_COMMON_NATIVE: '2.0.3' PIN_DKML_RUNTIME_COMMON: '2.0.3' diff --git a/test/gl/setup-dkml.gitlab-ci.yml b/test/gl/setup-dkml.gitlab-ci.yml index 304c5bd8..4ed76cad 100644 --- a/test/gl/setup-dkml.gitlab-ci.yml +++ b/test/gl/setup-dkml.gitlab-ci.yml @@ -48,8 +48,15 @@ variables: PIN_DKML_COMPONENT_COMMON_DESKTOP: '2.0.3' PIN_DKML_COMPONENT_COMMON_OPAM: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_COMMON_UNIXUTILS: '0.2.0' + PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE: '4.14.0~v2.0.3' + PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL: '2.0.3' + PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM: '2.2.0~alpha0~20221228' + PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS: '0.2.0' PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL: '2.0.3' PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR: '2.0.3' + PIN_DKML_COMPONENT_STAGING_OCAMLRUN: '4.14.0~v2.0.3' PIN_DKML_COMPONENT_STAGING_OPAM32: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_STAGING_OPAM64: '2.2.0~alpha0~20221228' PIN_DKML_COMPONENT_STAGING_UNIXUTILS: '0.2.0' @@ -61,6 +68,7 @@ variables: PIN_DKML_INSTALL_RUNNER: '0.5.1' PIN_DKML_INSTALL: '0.5.1' PIN_DKML_INSTALLER_OCAML_COMMON: '2.0.3' + PIN_DKML_INSTALLER_OCAML_OFFLINE: '2.0.3' PIN_DKML_PACKAGE_CONSOLE: '0.5.1' PIN_DKML_RUNTIME_COMMON_NATIVE: '2.0.3' PIN_DKML_RUNTIME_COMMON: '2.0.3' @@ -1523,8 +1531,15 @@ variables: opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-desktop "${PIN_DKML_COMPONENT_COMMON_DESKTOP}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-opam "${PIN_DKML_COMPONENT_COMMON_OPAM}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-unixutils "${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-common "${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-network "${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-offline "${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-desktop-full "${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-opamshim "${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-unixutils "${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-desktop-full "${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-dkmlconfdir "${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-ocamlrun "${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam32 "${PIN_DKML_COMPONENT_STAGING_OPAM32}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam64 "${PIN_DKML_COMPONENT_STAGING_OPAM64}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-unixutils "${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" @@ -1536,6 +1551,7 @@ variables: opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-installer "${PIN_DKML_INSTALL_INSTALLER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-runner "${PIN_DKML_INSTALL_RUNNER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-common "${PIN_DKML_INSTALLER_OCAML_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-offline "${PIN_DKML_INSTALLER_OCAML_OFFLINE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-package-console "${PIN_DKML_PACKAGE_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common "${PIN_DKML_RUNTIME_COMMON}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common-native "${PIN_DKML_RUNTIME_COMMON_NATIVE}" @@ -3503,8 +3519,15 @@ variables: opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-desktop "${PIN_DKML_COMPONENT_COMMON_DESKTOP}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-opam "${PIN_DKML_COMPONENT_COMMON_OPAM}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-unixutils "${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-common "${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-network "${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-offline "${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-desktop-full "${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-opamshim "${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-unixutils "${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-desktop-full "${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-dkmlconfdir "${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-ocamlrun "${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam32 "${PIN_DKML_COMPONENT_STAGING_OPAM32}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam64 "${PIN_DKML_COMPONENT_STAGING_OPAM64}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-unixutils "${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" @@ -3516,6 +3539,7 @@ variables: opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-installer "${PIN_DKML_INSTALL_INSTALLER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-runner "${PIN_DKML_INSTALL_RUNNER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-common "${PIN_DKML_INSTALLER_OCAML_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-offline "${PIN_DKML_INSTALLER_OCAML_OFFLINE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-package-console "${PIN_DKML_PACKAGE_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common "${PIN_DKML_RUNTIME_COMMON}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common-native "${PIN_DKML_RUNTIME_COMMON_NATIVE}" @@ -5201,8 +5225,15 @@ variables: opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-desktop "${PIN_DKML_COMPONENT_COMMON_DESKTOP}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-opam "${PIN_DKML_COMPONENT_COMMON_OPAM}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-unixutils "${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-common "${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-network "${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-offline "${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-desktop-full "${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-opamshim "${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-unixutils "${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-desktop-full "${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-dkmlconfdir "${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-ocamlrun "${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam32 "${PIN_DKML_COMPONENT_STAGING_OPAM32}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam64 "${PIN_DKML_COMPONENT_STAGING_OPAM64}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-unixutils "${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" @@ -5214,6 +5245,7 @@ variables: opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-installer "${PIN_DKML_INSTALL_INSTALLER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-runner "${PIN_DKML_INSTALL_RUNNER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-common "${PIN_DKML_INSTALLER_OCAML_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-offline "${PIN_DKML_INSTALLER_OCAML_OFFLINE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-package-console "${PIN_DKML_PACKAGE_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common "${PIN_DKML_RUNTIME_COMMON}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common-native "${PIN_DKML_RUNTIME_COMMON_NATIVE}" diff --git a/test/pc/setup-dkml-darwin_x86_64.sh b/test/pc/setup-dkml-darwin_x86_64.sh index 9dcd1a23..f06f9262 100644 --- a/test/pc/setup-dkml-darwin_x86_64.sh +++ b/test/pc/setup-dkml-darwin_x86_64.sh @@ -53,8 +53,15 @@ export PIN_DKML_COMPILER_SRC='2.0.3' export PIN_DKML_COMPONENT_COMMON_DESKTOP='2.0.3' export PIN_DKML_COMPONENT_COMMON_OPAM='2.2.0~alpha0~20221228' export PIN_DKML_COMPONENT_COMMON_UNIXUTILS='0.2.0' +export PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON='4.14.0~v2.0.3' +export PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK='4.14.0~v2.0.3' +export PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE='4.14.0~v2.0.3' +export PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL='2.0.3' +export PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM='2.2.0~alpha0~20221228' +export PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS='0.2.0' export PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL='2.0.3' export PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR='2.0.3' +export PIN_DKML_COMPONENT_STAGING_OCAMLRUN='4.14.0~v2.0.3' export PIN_DKML_COMPONENT_STAGING_OPAM32='2.2.0~alpha0~20221228' export PIN_DKML_COMPONENT_STAGING_OPAM64='2.2.0~alpha0~20221228' export PIN_DKML_COMPONENT_STAGING_UNIXUTILS='0.2.0' @@ -66,6 +73,7 @@ export PIN_DKML_INSTALL_INSTALLER='0.5.1' export PIN_DKML_INSTALL_RUNNER='0.5.1' export PIN_DKML_INSTALL='0.5.1' export PIN_DKML_INSTALLER_OCAML_COMMON='2.0.3' +export PIN_DKML_INSTALLER_OCAML_OFFLINE='2.0.3' export PIN_DKML_PACKAGE_CONSOLE='0.5.1' export PIN_DKML_RUNTIME_COMMON_NATIVE='2.0.3' export PIN_DKML_RUNTIME_COMMON='2.0.3' @@ -251,8 +259,15 @@ usage() { echo " --PIN_DKML_COMPONENT_COMMON_DESKTOP=. Defaults to: ${PIN_DKML_COMPONENT_COMMON_DESKTOP}" >&2 echo " --PIN_DKML_COMPONENT_COMMON_OPAM=. Defaults to: ${PIN_DKML_COMPONENT_COMMON_OPAM}" >&2 echo " --PIN_DKML_COMPONENT_COMMON_UNIXUTILS=. Defaults to: ${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" >&2 + echo " --PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON=. Defaults to: ${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" >&2 + echo " --PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK=. Defaults to: ${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" >&2 + echo " --PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE=. Defaults to: ${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" >&2 + echo " --PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL=. Defaults to: ${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" >&2 + echo " --PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM=. Defaults to: ${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" >&2 + echo " --PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS=. Defaults to: ${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" >&2 + echo " --PIN_DKML_COMPONENT_STAGING_OCAMLRUN=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_OPAM32=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_OPAM32}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_OPAM64=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_OPAM64}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_UNIXUTILS=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" >&2 @@ -264,6 +279,7 @@ usage() { echo " --PIN_DKML_INSTALL_RUNNER=. Defaults to: ${PIN_DKML_INSTALL_RUNNER}" >&2 echo " --PIN_DKML_INSTALL=. Defaults to: ${PIN_DKML_INSTALL}" >&2 echo " --PIN_DKML_INSTALLER_OCAML_COMMON=. Defaults to: ${PIN_DKML_INSTALLER_OCAML_COMMON}" >&2 + echo " --PIN_DKML_INSTALLER_OCAML_OFFLINE=. Defaults to: ${PIN_DKML_INSTALLER_OCAML_OFFLINE}" >&2 echo " --PIN_DKML_PACKAGE_CONSOLE=. Defaults to: ${PIN_DKML_PACKAGE_CONSOLE}" >&2 echo " --PIN_DKML_RUNTIME_COMMON_NATIVE=. Defaults to: ${PIN_DKML_RUNTIME_COMMON_NATIVE}" >&2 echo " --PIN_DKML_RUNTIME_COMMON=. Defaults to: ${PIN_DKML_RUNTIME_COMMON}" >&2 @@ -488,10 +504,24 @@ while getopts :h-: option; do PIN_DKML_COMPONENT_COMMON_OPAM=*) PIN_DKML_COMPONENT_COMMON_OPAM=${OPTARG#*=} ;; PIN_DKML_COMPONENT_COMMON_UNIXUTILS) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_COMMON_UNIXUTILS=*) PIN_DKML_COMPONENT_COMMON_UNIXUTILS=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON=*) PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK=*) PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE=*) PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL=*) PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM=*) PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS=*) PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS=${OPTARG#*=} ;; PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL=*) PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL=${OPTARG#*=} ;; PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR=*) PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_STAGING_OCAMLRUN) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_STAGING_OCAMLRUN=*) PIN_DKML_COMPONENT_STAGING_OCAMLRUN=${OPTARG#*=} ;; PIN_DKML_COMPONENT_STAGING_OPAM32) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_STAGING_OPAM32=*) PIN_DKML_COMPONENT_STAGING_OPAM32=${OPTARG#*=} ;; PIN_DKML_COMPONENT_STAGING_OPAM64) fail "Option \"$OPTARG\" missing argument" ;; @@ -514,6 +544,8 @@ while getopts :h-: option; do PIN_DKML_INSTALL=*) PIN_DKML_INSTALL=${OPTARG#*=} ;; PIN_DKML_INSTALLER_OCAML_COMMON) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_INSTALLER_OCAML_COMMON=*) PIN_DKML_INSTALLER_OCAML_COMMON=${OPTARG#*=} ;; + PIN_DKML_INSTALLER_OCAML_OFFLINE) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_INSTALLER_OCAML_OFFLINE=*) PIN_DKML_INSTALLER_OCAML_OFFLINE=${OPTARG#*=} ;; PIN_DKML_PACKAGE_CONSOLE) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_PACKAGE_CONSOLE=*) PIN_DKML_PACKAGE_CONSOLE=${OPTARG#*=} ;; PIN_DKML_RUNTIME_COMMON_NATIVE) fail "Option \"$OPTARG\" missing argument" ;; @@ -1943,8 +1975,15 @@ do_pins() { opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-desktop "${PIN_DKML_COMPONENT_COMMON_DESKTOP}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-opam "${PIN_DKML_COMPONENT_COMMON_OPAM}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-unixutils "${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-common "${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-network "${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-offline "${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-desktop-full "${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-opamshim "${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-unixutils "${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-desktop-full "${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-dkmlconfdir "${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-ocamlrun "${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam32 "${PIN_DKML_COMPONENT_STAGING_OPAM32}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam64 "${PIN_DKML_COMPONENT_STAGING_OPAM64}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-unixutils "${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" @@ -1956,6 +1995,7 @@ do_pins() { opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-installer "${PIN_DKML_INSTALL_INSTALLER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-runner "${PIN_DKML_INSTALL_RUNNER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-common "${PIN_DKML_INSTALLER_OCAML_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-offline "${PIN_DKML_INSTALLER_OCAML_OFFLINE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-package-console "${PIN_DKML_PACKAGE_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common "${PIN_DKML_RUNTIME_COMMON}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common-native "${PIN_DKML_RUNTIME_COMMON_NATIVE}" diff --git a/test/pc/setup-dkml-linux_x86.sh b/test/pc/setup-dkml-linux_x86.sh index 29a9070c..0cea1ff7 100644 --- a/test/pc/setup-dkml-linux_x86.sh +++ b/test/pc/setup-dkml-linux_x86.sh @@ -57,8 +57,15 @@ export PIN_DKML_COMPILER_SRC='2.0.3' export PIN_DKML_COMPONENT_COMMON_DESKTOP='2.0.3' export PIN_DKML_COMPONENT_COMMON_OPAM='2.2.0~alpha0~20221228' export PIN_DKML_COMPONENT_COMMON_UNIXUTILS='0.2.0' +export PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON='4.14.0~v2.0.3' +export PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK='4.14.0~v2.0.3' +export PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE='4.14.0~v2.0.3' +export PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL='2.0.3' +export PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM='2.2.0~alpha0~20221228' +export PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS='0.2.0' export PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL='2.0.3' export PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR='2.0.3' +export PIN_DKML_COMPONENT_STAGING_OCAMLRUN='4.14.0~v2.0.3' export PIN_DKML_COMPONENT_STAGING_OPAM32='2.2.0~alpha0~20221228' export PIN_DKML_COMPONENT_STAGING_OPAM64='2.2.0~alpha0~20221228' export PIN_DKML_COMPONENT_STAGING_UNIXUTILS='0.2.0' @@ -70,6 +77,7 @@ export PIN_DKML_INSTALL_INSTALLER='0.5.1' export PIN_DKML_INSTALL_RUNNER='0.5.1' export PIN_DKML_INSTALL='0.5.1' export PIN_DKML_INSTALLER_OCAML_COMMON='2.0.3' +export PIN_DKML_INSTALLER_OCAML_OFFLINE='2.0.3' export PIN_DKML_PACKAGE_CONSOLE='0.5.1' export PIN_DKML_RUNTIME_COMMON_NATIVE='2.0.3' export PIN_DKML_RUNTIME_COMMON='2.0.3' @@ -258,8 +266,15 @@ usage() { echo " --PIN_DKML_COMPONENT_COMMON_DESKTOP=. Defaults to: ${PIN_DKML_COMPONENT_COMMON_DESKTOP}" >&2 echo " --PIN_DKML_COMPONENT_COMMON_OPAM=. Defaults to: ${PIN_DKML_COMPONENT_COMMON_OPAM}" >&2 echo " --PIN_DKML_COMPONENT_COMMON_UNIXUTILS=. Defaults to: ${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" >&2 + echo " --PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON=. Defaults to: ${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" >&2 + echo " --PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK=. Defaults to: ${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" >&2 + echo " --PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE=. Defaults to: ${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" >&2 + echo " --PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL=. Defaults to: ${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" >&2 + echo " --PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM=. Defaults to: ${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" >&2 + echo " --PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS=. Defaults to: ${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" >&2 + echo " --PIN_DKML_COMPONENT_STAGING_OCAMLRUN=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_OPAM32=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_OPAM32}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_OPAM64=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_OPAM64}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_UNIXUTILS=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" >&2 @@ -271,6 +286,7 @@ usage() { echo " --PIN_DKML_INSTALL_RUNNER=. Defaults to: ${PIN_DKML_INSTALL_RUNNER}" >&2 echo " --PIN_DKML_INSTALL=. Defaults to: ${PIN_DKML_INSTALL}" >&2 echo " --PIN_DKML_INSTALLER_OCAML_COMMON=. Defaults to: ${PIN_DKML_INSTALLER_OCAML_COMMON}" >&2 + echo " --PIN_DKML_INSTALLER_OCAML_OFFLINE=. Defaults to: ${PIN_DKML_INSTALLER_OCAML_OFFLINE}" >&2 echo " --PIN_DKML_PACKAGE_CONSOLE=. Defaults to: ${PIN_DKML_PACKAGE_CONSOLE}" >&2 echo " --PIN_DKML_RUNTIME_COMMON_NATIVE=. Defaults to: ${PIN_DKML_RUNTIME_COMMON_NATIVE}" >&2 echo " --PIN_DKML_RUNTIME_COMMON=. Defaults to: ${PIN_DKML_RUNTIME_COMMON}" >&2 @@ -495,10 +511,24 @@ while getopts :h-: option; do PIN_DKML_COMPONENT_COMMON_OPAM=*) PIN_DKML_COMPONENT_COMMON_OPAM=${OPTARG#*=} ;; PIN_DKML_COMPONENT_COMMON_UNIXUTILS) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_COMMON_UNIXUTILS=*) PIN_DKML_COMPONENT_COMMON_UNIXUTILS=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON=*) PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK=*) PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE=*) PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL=*) PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM=*) PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS=*) PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS=${OPTARG#*=} ;; PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL=*) PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL=${OPTARG#*=} ;; PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR=*) PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_STAGING_OCAMLRUN) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_STAGING_OCAMLRUN=*) PIN_DKML_COMPONENT_STAGING_OCAMLRUN=${OPTARG#*=} ;; PIN_DKML_COMPONENT_STAGING_OPAM32) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_STAGING_OPAM32=*) PIN_DKML_COMPONENT_STAGING_OPAM32=${OPTARG#*=} ;; PIN_DKML_COMPONENT_STAGING_OPAM64) fail "Option \"$OPTARG\" missing argument" ;; @@ -521,6 +551,8 @@ while getopts :h-: option; do PIN_DKML_INSTALL=*) PIN_DKML_INSTALL=${OPTARG#*=} ;; PIN_DKML_INSTALLER_OCAML_COMMON) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_INSTALLER_OCAML_COMMON=*) PIN_DKML_INSTALLER_OCAML_COMMON=${OPTARG#*=} ;; + PIN_DKML_INSTALLER_OCAML_OFFLINE) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_INSTALLER_OCAML_OFFLINE=*) PIN_DKML_INSTALLER_OCAML_OFFLINE=${OPTARG#*=} ;; PIN_DKML_PACKAGE_CONSOLE) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_PACKAGE_CONSOLE=*) PIN_DKML_PACKAGE_CONSOLE=${OPTARG#*=} ;; PIN_DKML_RUNTIME_COMMON_NATIVE) fail "Option \"$OPTARG\" missing argument" ;; @@ -1950,8 +1982,15 @@ do_pins() { opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-desktop "${PIN_DKML_COMPONENT_COMMON_DESKTOP}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-opam "${PIN_DKML_COMPONENT_COMMON_OPAM}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-unixutils "${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-common "${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-network "${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-offline "${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-desktop-full "${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-opamshim "${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-unixutils "${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-desktop-full "${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-dkmlconfdir "${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-ocamlrun "${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam32 "${PIN_DKML_COMPONENT_STAGING_OPAM32}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam64 "${PIN_DKML_COMPONENT_STAGING_OPAM64}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-unixutils "${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" @@ -1963,6 +2002,7 @@ do_pins() { opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-installer "${PIN_DKML_INSTALL_INSTALLER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-runner "${PIN_DKML_INSTALL_RUNNER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-common "${PIN_DKML_INSTALLER_OCAML_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-offline "${PIN_DKML_INSTALLER_OCAML_OFFLINE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-package-console "${PIN_DKML_PACKAGE_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common "${PIN_DKML_RUNTIME_COMMON}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common-native "${PIN_DKML_RUNTIME_COMMON_NATIVE}" diff --git a/test/pc/setup-dkml-linux_x86_64.sh b/test/pc/setup-dkml-linux_x86_64.sh index 7a21d13d..02373932 100644 --- a/test/pc/setup-dkml-linux_x86_64.sh +++ b/test/pc/setup-dkml-linux_x86_64.sh @@ -57,8 +57,15 @@ export PIN_DKML_COMPILER_SRC='2.0.3' export PIN_DKML_COMPONENT_COMMON_DESKTOP='2.0.3' export PIN_DKML_COMPONENT_COMMON_OPAM='2.2.0~alpha0~20221228' export PIN_DKML_COMPONENT_COMMON_UNIXUTILS='0.2.0' +export PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON='4.14.0~v2.0.3' +export PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK='4.14.0~v2.0.3' +export PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE='4.14.0~v2.0.3' +export PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL='2.0.3' +export PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM='2.2.0~alpha0~20221228' +export PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS='0.2.0' export PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL='2.0.3' export PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR='2.0.3' +export PIN_DKML_COMPONENT_STAGING_OCAMLRUN='4.14.0~v2.0.3' export PIN_DKML_COMPONENT_STAGING_OPAM32='2.2.0~alpha0~20221228' export PIN_DKML_COMPONENT_STAGING_OPAM64='2.2.0~alpha0~20221228' export PIN_DKML_COMPONENT_STAGING_UNIXUTILS='0.2.0' @@ -70,6 +77,7 @@ export PIN_DKML_INSTALL_INSTALLER='0.5.1' export PIN_DKML_INSTALL_RUNNER='0.5.1' export PIN_DKML_INSTALL='0.5.1' export PIN_DKML_INSTALLER_OCAML_COMMON='2.0.3' +export PIN_DKML_INSTALLER_OCAML_OFFLINE='2.0.3' export PIN_DKML_PACKAGE_CONSOLE='0.5.1' export PIN_DKML_RUNTIME_COMMON_NATIVE='2.0.3' export PIN_DKML_RUNTIME_COMMON='2.0.3' @@ -258,8 +266,15 @@ usage() { echo " --PIN_DKML_COMPONENT_COMMON_DESKTOP=. Defaults to: ${PIN_DKML_COMPONENT_COMMON_DESKTOP}" >&2 echo " --PIN_DKML_COMPONENT_COMMON_OPAM=. Defaults to: ${PIN_DKML_COMPONENT_COMMON_OPAM}" >&2 echo " --PIN_DKML_COMPONENT_COMMON_UNIXUTILS=. Defaults to: ${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" >&2 + echo " --PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON=. Defaults to: ${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" >&2 + echo " --PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK=. Defaults to: ${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" >&2 + echo " --PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE=. Defaults to: ${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" >&2 + echo " --PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL=. Defaults to: ${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" >&2 + echo " --PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM=. Defaults to: ${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" >&2 + echo " --PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS=. Defaults to: ${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" >&2 + echo " --PIN_DKML_COMPONENT_STAGING_OCAMLRUN=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_OPAM32=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_OPAM32}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_OPAM64=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_OPAM64}" >&2 echo " --PIN_DKML_COMPONENT_STAGING_UNIXUTILS=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" >&2 @@ -271,6 +286,7 @@ usage() { echo " --PIN_DKML_INSTALL_RUNNER=. Defaults to: ${PIN_DKML_INSTALL_RUNNER}" >&2 echo " --PIN_DKML_INSTALL=. Defaults to: ${PIN_DKML_INSTALL}" >&2 echo " --PIN_DKML_INSTALLER_OCAML_COMMON=. Defaults to: ${PIN_DKML_INSTALLER_OCAML_COMMON}" >&2 + echo " --PIN_DKML_INSTALLER_OCAML_OFFLINE=. Defaults to: ${PIN_DKML_INSTALLER_OCAML_OFFLINE}" >&2 echo " --PIN_DKML_PACKAGE_CONSOLE=. Defaults to: ${PIN_DKML_PACKAGE_CONSOLE}" >&2 echo " --PIN_DKML_RUNTIME_COMMON_NATIVE=. Defaults to: ${PIN_DKML_RUNTIME_COMMON_NATIVE}" >&2 echo " --PIN_DKML_RUNTIME_COMMON=. Defaults to: ${PIN_DKML_RUNTIME_COMMON}" >&2 @@ -495,10 +511,24 @@ while getopts :h-: option; do PIN_DKML_COMPONENT_COMMON_OPAM=*) PIN_DKML_COMPONENT_COMMON_OPAM=${OPTARG#*=} ;; PIN_DKML_COMPONENT_COMMON_UNIXUTILS) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_COMMON_UNIXUTILS=*) PIN_DKML_COMPONENT_COMMON_UNIXUTILS=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON=*) PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK=*) PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE=*) PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL=*) PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM=*) PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS=*) PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS=${OPTARG#*=} ;; PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL=*) PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL=${OPTARG#*=} ;; PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR=*) PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_STAGING_OCAMLRUN) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_STAGING_OCAMLRUN=*) PIN_DKML_COMPONENT_STAGING_OCAMLRUN=${OPTARG#*=} ;; PIN_DKML_COMPONENT_STAGING_OPAM32) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_STAGING_OPAM32=*) PIN_DKML_COMPONENT_STAGING_OPAM32=${OPTARG#*=} ;; PIN_DKML_COMPONENT_STAGING_OPAM64) fail "Option \"$OPTARG\" missing argument" ;; @@ -521,6 +551,8 @@ while getopts :h-: option; do PIN_DKML_INSTALL=*) PIN_DKML_INSTALL=${OPTARG#*=} ;; PIN_DKML_INSTALLER_OCAML_COMMON) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_INSTALLER_OCAML_COMMON=*) PIN_DKML_INSTALLER_OCAML_COMMON=${OPTARG#*=} ;; + PIN_DKML_INSTALLER_OCAML_OFFLINE) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_INSTALLER_OCAML_OFFLINE=*) PIN_DKML_INSTALLER_OCAML_OFFLINE=${OPTARG#*=} ;; PIN_DKML_PACKAGE_CONSOLE) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_PACKAGE_CONSOLE=*) PIN_DKML_PACKAGE_CONSOLE=${OPTARG#*=} ;; PIN_DKML_RUNTIME_COMMON_NATIVE) fail "Option \"$OPTARG\" missing argument" ;; @@ -1950,8 +1982,15 @@ do_pins() { opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-desktop "${PIN_DKML_COMPONENT_COMMON_DESKTOP}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-opam "${PIN_DKML_COMPONENT_COMMON_OPAM}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-unixutils "${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-common "${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-network "${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-offline "${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-desktop-full "${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-opamshim "${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-unixutils "${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-desktop-full "${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-dkmlconfdir "${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-ocamlrun "${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam32 "${PIN_DKML_COMPONENT_STAGING_OPAM32}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam64 "${PIN_DKML_COMPONENT_STAGING_OPAM64}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-unixutils "${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" @@ -1963,6 +2002,7 @@ do_pins() { opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-installer "${PIN_DKML_INSTALL_INSTALLER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-runner "${PIN_DKML_INSTALL_RUNNER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-common "${PIN_DKML_INSTALLER_OCAML_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-offline "${PIN_DKML_INSTALLER_OCAML_OFFLINE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-package-console "${PIN_DKML_PACKAGE_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common "${PIN_DKML_RUNTIME_COMMON}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common-native "${PIN_DKML_RUNTIME_COMMON_NATIVE}" diff --git a/test/pc/setup-dkml-windows_x86.ps1 b/test/pc/setup-dkml-windows_x86.ps1 index 43fb7eeb..15973621 100644 --- a/test/pc/setup-dkml-windows_x86.ps1 +++ b/test/pc/setup-dkml-windows_x86.ps1 @@ -141,12 +141,33 @@ Environment variable. .PARAMETER PIN_DKML_COMPONENT_COMMON_UNIXUTILS Environment variable. +.PARAMETER PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON +Environment variable. + +.PARAMETER PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK +Environment variable. + +.PARAMETER PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE +Environment variable. + +.PARAMETER PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL +Environment variable. + +.PARAMETER PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM +Environment variable. + +.PARAMETER PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS +Environment variable. + .PARAMETER PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL Environment variable. .PARAMETER PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR Environment variable. +.PARAMETER PIN_DKML_COMPONENT_STAGING_OCAMLRUN +Environment variable. + .PARAMETER PIN_DKML_COMPONENT_STAGING_OPAM32 Environment variable. @@ -180,6 +201,9 @@ Environment variable. .PARAMETER PIN_DKML_INSTALLER_OCAML_COMMON Environment variable. +.PARAMETER PIN_DKML_INSTALLER_OCAML_OFFLINE +Environment variable. + .PARAMETER PIN_DKML_PACKAGE_CONSOLE Environment variable. @@ -603,8 +627,15 @@ param ( ,[Parameter()] [string] $PIN_DKML_COMPONENT_COMMON_DESKTOP = "2.0.3" ,[Parameter()] [string] $PIN_DKML_COMPONENT_COMMON_OPAM = "2.2.0~alpha0~20221228" ,[Parameter()] [string] $PIN_DKML_COMPONENT_COMMON_UNIXUTILS = "0.2.0" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON = "4.14.0~v2.0.3" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK = "4.14.0~v2.0.3" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE = "4.14.0~v2.0.3" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL = "2.0.3" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM = "2.2.0~alpha0~20221228" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS = "0.2.0" ,[Parameter()] [string] $PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL = "2.0.3" ,[Parameter()] [string] $PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR = "2.0.3" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_STAGING_OCAMLRUN = "4.14.0~v2.0.3" ,[Parameter()] [string] $PIN_DKML_COMPONENT_STAGING_OPAM32 = "2.2.0~alpha0~20221228" ,[Parameter()] [string] $PIN_DKML_COMPONENT_STAGING_OPAM64 = "2.2.0~alpha0~20221228" ,[Parameter()] [string] $PIN_DKML_COMPONENT_STAGING_UNIXUTILS = "0.2.0" @@ -616,6 +647,7 @@ param ( ,[Parameter()] [string] $PIN_DKML_INSTALL_RUNNER = "0.5.1" ,[Parameter()] [string] $PIN_DKML_INSTALL = "0.5.1" ,[Parameter()] [string] $PIN_DKML_INSTALLER_OCAML_COMMON = "2.0.3" + ,[Parameter()] [string] $PIN_DKML_INSTALLER_OCAML_OFFLINE = "2.0.3" ,[Parameter()] [string] $PIN_DKML_PACKAGE_CONSOLE = "0.5.1" ,[Parameter()] [string] $PIN_DKML_RUNTIME_COMMON_NATIVE = "2.0.3" ,[Parameter()] [string] $PIN_DKML_RUNTIME_COMMON = "2.0.3" @@ -813,8 +845,15 @@ $env:PIN_DKML_COMPILER_SRC = $PIN_DKML_COMPILER_SRC $env:PIN_DKML_COMPONENT_COMMON_DESKTOP = $PIN_DKML_COMPONENT_COMMON_DESKTOP $env:PIN_DKML_COMPONENT_COMMON_OPAM = $PIN_DKML_COMPONENT_COMMON_OPAM $env:PIN_DKML_COMPONENT_COMMON_UNIXUTILS = $PIN_DKML_COMPONENT_COMMON_UNIXUTILS +$env:PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON = $PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON +$env:PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK = $PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK +$env:PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE = $PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE +$env:PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL = $PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL +$env:PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM = $PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM +$env:PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS = $PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS $env:PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL = $PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL $env:PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR = $PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR +$env:PIN_DKML_COMPONENT_STAGING_OCAMLRUN = $PIN_DKML_COMPONENT_STAGING_OCAMLRUN $env:PIN_DKML_COMPONENT_STAGING_OPAM32 = $PIN_DKML_COMPONENT_STAGING_OPAM32 $env:PIN_DKML_COMPONENT_STAGING_OPAM64 = $PIN_DKML_COMPONENT_STAGING_OPAM64 $env:PIN_DKML_COMPONENT_STAGING_UNIXUTILS = $PIN_DKML_COMPONENT_STAGING_UNIXUTILS @@ -826,6 +865,7 @@ $env:PIN_DKML_INSTALL_INSTALLER = $PIN_DKML_INSTALL_INSTALLER $env:PIN_DKML_INSTALL_RUNNER = $PIN_DKML_INSTALL_RUNNER $env:PIN_DKML_INSTALL = $PIN_DKML_INSTALL $env:PIN_DKML_INSTALLER_OCAML_COMMON = $PIN_DKML_INSTALLER_OCAML_COMMON +$env:PIN_DKML_INSTALLER_OCAML_OFFLINE = $PIN_DKML_INSTALLER_OCAML_OFFLINE $env:PIN_DKML_PACKAGE_CONSOLE = $PIN_DKML_PACKAGE_CONSOLE $env:PIN_DKML_RUNTIME_COMMON_NATIVE = $PIN_DKML_RUNTIME_COMMON_NATIVE $env:PIN_DKML_RUNTIME_COMMON = $PIN_DKML_RUNTIME_COMMON @@ -2183,8 +2223,15 @@ do_pins() { opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-desktop "${PIN_DKML_COMPONENT_COMMON_DESKTOP}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-opam "${PIN_DKML_COMPONENT_COMMON_OPAM}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-unixutils "${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-common "${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-network "${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-offline "${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-desktop-full "${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-opamshim "${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-unixutils "${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-desktop-full "${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-dkmlconfdir "${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-ocamlrun "${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam32 "${PIN_DKML_COMPONENT_STAGING_OPAM32}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam64 "${PIN_DKML_COMPONENT_STAGING_OPAM64}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-unixutils "${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" @@ -2196,6 +2243,7 @@ do_pins() { opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-installer "${PIN_DKML_INSTALL_INSTALLER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-runner "${PIN_DKML_INSTALL_RUNNER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-common "${PIN_DKML_INSTALLER_OCAML_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-offline "${PIN_DKML_INSTALLER_OCAML_OFFLINE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-package-console "${PIN_DKML_PACKAGE_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common "${PIN_DKML_RUNTIME_COMMON}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common-native "${PIN_DKML_RUNTIME_COMMON_NATIVE}" diff --git a/test/pc/setup-dkml-windows_x86_64.ps1 b/test/pc/setup-dkml-windows_x86_64.ps1 index 396bcba9..bbbb463b 100644 --- a/test/pc/setup-dkml-windows_x86_64.ps1 +++ b/test/pc/setup-dkml-windows_x86_64.ps1 @@ -141,12 +141,33 @@ Environment variable. .PARAMETER PIN_DKML_COMPONENT_COMMON_UNIXUTILS Environment variable. +.PARAMETER PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON +Environment variable. + +.PARAMETER PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK +Environment variable. + +.PARAMETER PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE +Environment variable. + +.PARAMETER PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL +Environment variable. + +.PARAMETER PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM +Environment variable. + +.PARAMETER PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS +Environment variable. + .PARAMETER PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL Environment variable. .PARAMETER PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR Environment variable. +.PARAMETER PIN_DKML_COMPONENT_STAGING_OCAMLRUN +Environment variable. + .PARAMETER PIN_DKML_COMPONENT_STAGING_OPAM32 Environment variable. @@ -180,6 +201,9 @@ Environment variable. .PARAMETER PIN_DKML_INSTALLER_OCAML_COMMON Environment variable. +.PARAMETER PIN_DKML_INSTALLER_OCAML_OFFLINE +Environment variable. + .PARAMETER PIN_DKML_PACKAGE_CONSOLE Environment variable. @@ -603,8 +627,15 @@ param ( ,[Parameter()] [string] $PIN_DKML_COMPONENT_COMMON_DESKTOP = "2.0.3" ,[Parameter()] [string] $PIN_DKML_COMPONENT_COMMON_OPAM = "2.2.0~alpha0~20221228" ,[Parameter()] [string] $PIN_DKML_COMPONENT_COMMON_UNIXUTILS = "0.2.0" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON = "4.14.0~v2.0.3" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK = "4.14.0~v2.0.3" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE = "4.14.0~v2.0.3" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL = "2.0.3" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM = "2.2.0~alpha0~20221228" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS = "0.2.0" ,[Parameter()] [string] $PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL = "2.0.3" ,[Parameter()] [string] $PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR = "2.0.3" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_STAGING_OCAMLRUN = "4.14.0~v2.0.3" ,[Parameter()] [string] $PIN_DKML_COMPONENT_STAGING_OPAM32 = "2.2.0~alpha0~20221228" ,[Parameter()] [string] $PIN_DKML_COMPONENT_STAGING_OPAM64 = "2.2.0~alpha0~20221228" ,[Parameter()] [string] $PIN_DKML_COMPONENT_STAGING_UNIXUTILS = "0.2.0" @@ -616,6 +647,7 @@ param ( ,[Parameter()] [string] $PIN_DKML_INSTALL_RUNNER = "0.5.1" ,[Parameter()] [string] $PIN_DKML_INSTALL = "0.5.1" ,[Parameter()] [string] $PIN_DKML_INSTALLER_OCAML_COMMON = "2.0.3" + ,[Parameter()] [string] $PIN_DKML_INSTALLER_OCAML_OFFLINE = "2.0.3" ,[Parameter()] [string] $PIN_DKML_PACKAGE_CONSOLE = "0.5.1" ,[Parameter()] [string] $PIN_DKML_RUNTIME_COMMON_NATIVE = "2.0.3" ,[Parameter()] [string] $PIN_DKML_RUNTIME_COMMON = "2.0.3" @@ -812,8 +844,15 @@ $env:PIN_DKML_COMPILER_SRC = $PIN_DKML_COMPILER_SRC $env:PIN_DKML_COMPONENT_COMMON_DESKTOP = $PIN_DKML_COMPONENT_COMMON_DESKTOP $env:PIN_DKML_COMPONENT_COMMON_OPAM = $PIN_DKML_COMPONENT_COMMON_OPAM $env:PIN_DKML_COMPONENT_COMMON_UNIXUTILS = $PIN_DKML_COMPONENT_COMMON_UNIXUTILS +$env:PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON = $PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON +$env:PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK = $PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK +$env:PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE = $PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE +$env:PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL = $PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL +$env:PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM = $PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM +$env:PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS = $PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS $env:PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL = $PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL $env:PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR = $PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR +$env:PIN_DKML_COMPONENT_STAGING_OCAMLRUN = $PIN_DKML_COMPONENT_STAGING_OCAMLRUN $env:PIN_DKML_COMPONENT_STAGING_OPAM32 = $PIN_DKML_COMPONENT_STAGING_OPAM32 $env:PIN_DKML_COMPONENT_STAGING_OPAM64 = $PIN_DKML_COMPONENT_STAGING_OPAM64 $env:PIN_DKML_COMPONENT_STAGING_UNIXUTILS = $PIN_DKML_COMPONENT_STAGING_UNIXUTILS @@ -825,6 +864,7 @@ $env:PIN_DKML_INSTALL_INSTALLER = $PIN_DKML_INSTALL_INSTALLER $env:PIN_DKML_INSTALL_RUNNER = $PIN_DKML_INSTALL_RUNNER $env:PIN_DKML_INSTALL = $PIN_DKML_INSTALL $env:PIN_DKML_INSTALLER_OCAML_COMMON = $PIN_DKML_INSTALLER_OCAML_COMMON +$env:PIN_DKML_INSTALLER_OCAML_OFFLINE = $PIN_DKML_INSTALLER_OCAML_OFFLINE $env:PIN_DKML_PACKAGE_CONSOLE = $PIN_DKML_PACKAGE_CONSOLE $env:PIN_DKML_RUNTIME_COMMON_NATIVE = $PIN_DKML_RUNTIME_COMMON_NATIVE $env:PIN_DKML_RUNTIME_COMMON = $PIN_DKML_RUNTIME_COMMON @@ -2182,8 +2222,15 @@ do_pins() { opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-desktop "${PIN_DKML_COMPONENT_COMMON_DESKTOP}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-opam "${PIN_DKML_COMPONENT_COMMON_OPAM}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-common-unixutils "${PIN_DKML_COMPONENT_COMMON_UNIXUTILS}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-common "${PIN_DKML_COMPONENT_OCAMLCOMPILER_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-network "${PIN_DKML_COMPONENT_OCAMLCOMPILER_NETWORK}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-ocamlcompiler-offline "${PIN_DKML_COMPONENT_OCAMLCOMPILER_OFFLINE}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-desktop-full "${PIN_DKML_COMPONENT_OFFLINE_DESKTOP_FULL}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-opamshim "${PIN_DKML_COMPONENT_OFFLINE_OPAMSHIM}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-offline-unixutils "${PIN_DKML_COMPONENT_OFFLINE_UNIXUTILS}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-desktop-full "${PIN_DKML_COMPONENT_STAGING_DESKTOP_FULL}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-dkmlconfdir "${PIN_DKML_COMPONENT_STAGING_DKMLCONFDIR}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-ocamlrun "${PIN_DKML_COMPONENT_STAGING_OCAMLRUN}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam32 "${PIN_DKML_COMPONENT_STAGING_OPAM32}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-opam64 "${PIN_DKML_COMPONENT_STAGING_OPAM64}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-unixutils "${PIN_DKML_COMPONENT_STAGING_UNIXUTILS}" @@ -2195,6 +2242,7 @@ do_pins() { opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-installer "${PIN_DKML_INSTALL_INSTALLER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-install-runner "${PIN_DKML_INSTALL_RUNNER}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-common "${PIN_DKML_INSTALLER_OCAML_COMMON}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-installer-ocaml-offline "${PIN_DKML_INSTALLER_OCAML_OFFLINE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-package-console "${PIN_DKML_PACKAGE_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common "${PIN_DKML_RUNTIME_COMMON}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-runtime-common-native "${PIN_DKML_RUNTIME_COMMON_NATIVE}"