From 55e56d55f7214d21b94bcf2fff49a53b7b8dd168 Mon Sep 17 00:00:00 2001 From: Jonah Beckford <71855677+jonahbeckford@users.noreply.github.com> Date: Mon, 4 Sep 2023 00:06:03 -0700 Subject: [PATCH] Bump package lists --- src/logic/model.ml | 13 +++++ src/scripts/setup-dkml.sh | 13 +++++ test/gh-darwin/post/action.yml | 13 +++++ test/gh-darwin/pre/action.yml | 28 +++++++++- test/gh-linux/post/action.yml | 13 +++++ test/gh-linux/pre/action.yml | 28 +++++++++- test/gh-windows/post/action.yml | 13 +++++ test/gh-windows/pre/action.yml | 28 +++++++++- test/gl/setup-dkml.gitlab-ci.yml | 52 ++++++++++++++++++ test/pc/setup-dkml-darwin_x86_64.sh | 65 ++++++++++++++++++++++ test/pc/setup-dkml-linux_x86.sh | 65 ++++++++++++++++++++++ test/pc/setup-dkml-linux_x86_64.sh | 65 ++++++++++++++++++++++ test/pc/setup-dkml-windows_x86.ps1 | 78 +++++++++++++++++++++++++++ test/pc/setup-dkml-windows_x86_64.ps1 | 78 +++++++++++++++++++++++++++ 14 files changed, 549 insertions(+), 3 deletions(-) diff --git a/src/logic/model.ml b/src/logic/model.ml index 10e93e14..8faf4b0b 100755 --- a/src/logic/model.ml +++ b/src/logic/model.ml @@ -46,6 +46,19 @@ 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"); + ("PIN_DKML_COMPONENT_STAGING_WITHDKML", "2.0.3"); ("PIN_DKML_COMPONENT_XX_CONSOLE", "0.1.1"); ("PIN_DKML_EXE_LIB", "2.0.3"); ("PIN_DKML_EXE", "2.0.3"); diff --git a/src/scripts/setup-dkml.sh b/src/scripts/setup-dkml.sh index 3851f763..97df7fc4 100755 --- a/src/scripts/setup-dkml.sh +++ b/src/scripts/setup-dkml.sh @@ -938,6 +938,19 @@ 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}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-withdkml "${PIN_DKML_COMPONENT_STAGING_WITHDKML}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-xx-console "${PIN_DKML_COMPONENT_XX_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe "${PIN_DKML_EXE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe-lib "${PIN_DKML_EXE_LIB}" diff --git a/test/gh-darwin/post/action.yml b/test/gh-darwin/post/action.yml index 29aadf63..3937f048 100644 --- a/test/gh-darwin/post/action.yml +++ b/test/gh-darwin/post/action.yml @@ -83,6 +83,19 @@ 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' + PIN_DKML_COMPONENT_STAGING_WITHDKML: '2.0.3' PIN_DKML_COMPONENT_XX_CONSOLE: '0.1.1' PIN_DKML_EXE_LIB: '2.0.3' PIN_DKML_EXE: '2.0.3' diff --git a/test/gh-darwin/pre/action.yml b/test/gh-darwin/pre/action.yml index dab2ec20..7aa41e20 100644 --- a/test/gh-darwin/pre/action.yml +++ b/test/gh-darwin/pre/action.yml @@ -1268,6 +1268,19 @@ 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}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-withdkml "${PIN_DKML_COMPONENT_STAGING_WITHDKML}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-xx-console "${PIN_DKML_COMPONENT_XX_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe "${PIN_DKML_EXE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe-lib "${PIN_DKML_EXE_LIB}" @@ -1753,7 +1766,7 @@ runs: shell: bash run: | set -x - echo '9e10b8-${{ 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 'adb46c-${{ 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 @@ -1853,6 +1866,19 @@ 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' + PIN_DKML_COMPONENT_STAGING_WITHDKML: '2.0.3' PIN_DKML_COMPONENT_XX_CONSOLE: '0.1.1' PIN_DKML_EXE_LIB: '2.0.3' PIN_DKML_EXE: '2.0.3' diff --git a/test/gh-linux/post/action.yml b/test/gh-linux/post/action.yml index 0a32e4d0..54179013 100644 --- a/test/gh-linux/post/action.yml +++ b/test/gh-linux/post/action.yml @@ -99,6 +99,19 @@ 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' + PIN_DKML_COMPONENT_STAGING_WITHDKML: '2.0.3' PIN_DKML_COMPONENT_XX_CONSOLE: '0.1.1' PIN_DKML_EXE_LIB: '2.0.3' PIN_DKML_EXE: '2.0.3' diff --git a/test/gh-linux/pre/action.yml b/test/gh-linux/pre/action.yml index d49d5c6d..4ed284f4 100644 --- a/test/gh-linux/pre/action.yml +++ b/test/gh-linux/pre/action.yml @@ -1296,6 +1296,19 @@ 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}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-withdkml "${PIN_DKML_COMPONENT_STAGING_WITHDKML}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-xx-console "${PIN_DKML_COMPONENT_XX_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe "${PIN_DKML_EXE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe-lib "${PIN_DKML_EXE_LIB}" @@ -1781,7 +1794,7 @@ runs: shell: bash run: | set -x - echo '9e10b8-${{ 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 'adb46c-${{ 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 @@ -1912,6 +1925,19 @@ 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' + PIN_DKML_COMPONENT_STAGING_WITHDKML: '2.0.3' PIN_DKML_COMPONENT_XX_CONSOLE: '0.1.1' PIN_DKML_EXE_LIB: '2.0.3' PIN_DKML_EXE: '2.0.3' diff --git a/test/gh-windows/post/action.yml b/test/gh-windows/post/action.yml index 12c8fc64..751c8d62 100644 --- a/test/gh-windows/post/action.yml +++ b/test/gh-windows/post/action.yml @@ -112,6 +112,19 @@ 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' + PIN_DKML_COMPONENT_STAGING_WITHDKML: '2.0.3' PIN_DKML_COMPONENT_XX_CONSOLE: '0.1.1' PIN_DKML_EXE_LIB: '2.0.3' PIN_DKML_EXE: '2.0.3' diff --git a/test/gh-windows/pre/action.yml b/test/gh-windows/pre/action.yml index 1a438487..ac77b5cd 100644 --- a/test/gh-windows/pre/action.yml +++ b/test/gh-windows/pre/action.yml @@ -1329,6 +1329,19 @@ 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}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-withdkml "${PIN_DKML_COMPONENT_STAGING_WITHDKML}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-xx-console "${PIN_DKML_COMPONENT_XX_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe "${PIN_DKML_EXE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe-lib "${PIN_DKML_EXE_LIB}" @@ -1952,7 +1965,7 @@ runs: shell: bash run: | set -x - echo '9e10b8-${{ 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 'adb46c-${{ 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 @@ -2084,6 +2097,19 @@ 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' + PIN_DKML_COMPONENT_STAGING_WITHDKML: '2.0.3' PIN_DKML_COMPONENT_XX_CONSOLE: '0.1.1' PIN_DKML_EXE_LIB: '2.0.3' PIN_DKML_EXE: '2.0.3' diff --git a/test/gl/setup-dkml.gitlab-ci.yml b/test/gl/setup-dkml.gitlab-ci.yml index b1037547..38d7a4f0 100644 --- a/test/gl/setup-dkml.gitlab-ci.yml +++ b/test/gl/setup-dkml.gitlab-ci.yml @@ -48,6 +48,19 @@ 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' + PIN_DKML_COMPONENT_STAGING_WITHDKML: '2.0.3' PIN_DKML_COMPONENT_XX_CONSOLE: '0.1.1' PIN_DKML_EXE_LIB: '2.0.3' PIN_DKML_EXE: '2.0.3' @@ -1517,6 +1530,19 @@ 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}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-withdkml "${PIN_DKML_COMPONENT_STAGING_WITHDKML}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-xx-console "${PIN_DKML_COMPONENT_XX_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe "${PIN_DKML_EXE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe-lib "${PIN_DKML_EXE_LIB}" @@ -3491,6 +3517,19 @@ 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}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-withdkml "${PIN_DKML_COMPONENT_STAGING_WITHDKML}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-xx-console "${PIN_DKML_COMPONENT_XX_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe "${PIN_DKML_EXE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe-lib "${PIN_DKML_EXE_LIB}" @@ -5183,6 +5222,19 @@ 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}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-withdkml "${PIN_DKML_COMPONENT_STAGING_WITHDKML}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-xx-console "${PIN_DKML_COMPONENT_XX_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe "${PIN_DKML_EXE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe-lib "${PIN_DKML_EXE_LIB}" diff --git a/test/pc/setup-dkml-darwin_x86_64.sh b/test/pc/setup-dkml-darwin_x86_64.sh index 0c22086c..f73cd216 100644 --- a/test/pc/setup-dkml-darwin_x86_64.sh +++ b/test/pc/setup-dkml-darwin_x86_64.sh @@ -53,6 +53,19 @@ 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' +export PIN_DKML_COMPONENT_STAGING_WITHDKML='2.0.3' export PIN_DKML_COMPONENT_XX_CONSOLE='0.1.1' export PIN_DKML_EXE_LIB='2.0.3' export PIN_DKML_EXE='2.0.3' @@ -245,6 +258,19 @@ 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 + echo " --PIN_DKML_COMPONENT_STAGING_WITHDKML=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_WITHDKML}" >&2 echo " --PIN_DKML_COMPONENT_XX_CONSOLE=. Defaults to: ${PIN_DKML_COMPONENT_XX_CONSOLE}" >&2 echo " --PIN_DKML_EXE_LIB=. Defaults to: ${PIN_DKML_EXE_LIB}" >&2 echo " --PIN_DKML_EXE=. Defaults to: ${PIN_DKML_EXE}" >&2 @@ -476,6 +502,32 @@ 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" ;; + PIN_DKML_COMPONENT_STAGING_OPAM64=*) PIN_DKML_COMPONENT_STAGING_OPAM64=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_STAGING_UNIXUTILS) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_STAGING_UNIXUTILS=*) PIN_DKML_COMPONENT_STAGING_UNIXUTILS=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_STAGING_WITHDKML) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_STAGING_WITHDKML=*) PIN_DKML_COMPONENT_STAGING_WITHDKML=${OPTARG#*=} ;; PIN_DKML_COMPONENT_XX_CONSOLE) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_XX_CONSOLE=*) PIN_DKML_COMPONENT_XX_CONSOLE=${OPTARG#*=} ;; PIN_DKML_EXE_LIB) fail "Option \"$OPTARG\" missing argument" ;; @@ -1919,6 +1971,19 @@ 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}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-withdkml "${PIN_DKML_COMPONENT_STAGING_WITHDKML}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-xx-console "${PIN_DKML_COMPONENT_XX_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe "${PIN_DKML_EXE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe-lib "${PIN_DKML_EXE_LIB}" diff --git a/test/pc/setup-dkml-linux_x86.sh b/test/pc/setup-dkml-linux_x86.sh index 4f9f0b83..89083da2 100644 --- a/test/pc/setup-dkml-linux_x86.sh +++ b/test/pc/setup-dkml-linux_x86.sh @@ -57,6 +57,19 @@ 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' +export PIN_DKML_COMPONENT_STAGING_WITHDKML='2.0.3' export PIN_DKML_COMPONENT_XX_CONSOLE='0.1.1' export PIN_DKML_EXE_LIB='2.0.3' export PIN_DKML_EXE='2.0.3' @@ -252,6 +265,19 @@ 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 + echo " --PIN_DKML_COMPONENT_STAGING_WITHDKML=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_WITHDKML}" >&2 echo " --PIN_DKML_COMPONENT_XX_CONSOLE=. Defaults to: ${PIN_DKML_COMPONENT_XX_CONSOLE}" >&2 echo " --PIN_DKML_EXE_LIB=. Defaults to: ${PIN_DKML_EXE_LIB}" >&2 echo " --PIN_DKML_EXE=. Defaults to: ${PIN_DKML_EXE}" >&2 @@ -483,6 +509,32 @@ 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" ;; + PIN_DKML_COMPONENT_STAGING_OPAM64=*) PIN_DKML_COMPONENT_STAGING_OPAM64=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_STAGING_UNIXUTILS) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_STAGING_UNIXUTILS=*) PIN_DKML_COMPONENT_STAGING_UNIXUTILS=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_STAGING_WITHDKML) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_STAGING_WITHDKML=*) PIN_DKML_COMPONENT_STAGING_WITHDKML=${OPTARG#*=} ;; PIN_DKML_COMPONENT_XX_CONSOLE) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_XX_CONSOLE=*) PIN_DKML_COMPONENT_XX_CONSOLE=${OPTARG#*=} ;; PIN_DKML_EXE_LIB) fail "Option \"$OPTARG\" missing argument" ;; @@ -1926,6 +1978,19 @@ 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}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-withdkml "${PIN_DKML_COMPONENT_STAGING_WITHDKML}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-xx-console "${PIN_DKML_COMPONENT_XX_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe "${PIN_DKML_EXE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe-lib "${PIN_DKML_EXE_LIB}" diff --git a/test/pc/setup-dkml-linux_x86_64.sh b/test/pc/setup-dkml-linux_x86_64.sh index bdfb5051..89c49f34 100644 --- a/test/pc/setup-dkml-linux_x86_64.sh +++ b/test/pc/setup-dkml-linux_x86_64.sh @@ -57,6 +57,19 @@ 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' +export PIN_DKML_COMPONENT_STAGING_WITHDKML='2.0.3' export PIN_DKML_COMPONENT_XX_CONSOLE='0.1.1' export PIN_DKML_EXE_LIB='2.0.3' export PIN_DKML_EXE='2.0.3' @@ -252,6 +265,19 @@ 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 + echo " --PIN_DKML_COMPONENT_STAGING_WITHDKML=. Defaults to: ${PIN_DKML_COMPONENT_STAGING_WITHDKML}" >&2 echo " --PIN_DKML_COMPONENT_XX_CONSOLE=. Defaults to: ${PIN_DKML_COMPONENT_XX_CONSOLE}" >&2 echo " --PIN_DKML_EXE_LIB=. Defaults to: ${PIN_DKML_EXE_LIB}" >&2 echo " --PIN_DKML_EXE=. Defaults to: ${PIN_DKML_EXE}" >&2 @@ -483,6 +509,32 @@ 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" ;; + PIN_DKML_COMPONENT_STAGING_OPAM64=*) PIN_DKML_COMPONENT_STAGING_OPAM64=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_STAGING_UNIXUTILS) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_STAGING_UNIXUTILS=*) PIN_DKML_COMPONENT_STAGING_UNIXUTILS=${OPTARG#*=} ;; + PIN_DKML_COMPONENT_STAGING_WITHDKML) fail "Option \"$OPTARG\" missing argument" ;; + PIN_DKML_COMPONENT_STAGING_WITHDKML=*) PIN_DKML_COMPONENT_STAGING_WITHDKML=${OPTARG#*=} ;; PIN_DKML_COMPONENT_XX_CONSOLE) fail "Option \"$OPTARG\" missing argument" ;; PIN_DKML_COMPONENT_XX_CONSOLE=*) PIN_DKML_COMPONENT_XX_CONSOLE=${OPTARG#*=} ;; PIN_DKML_EXE_LIB) fail "Option \"$OPTARG\" missing argument" ;; @@ -1926,6 +1978,19 @@ 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}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-withdkml "${PIN_DKML_COMPONENT_STAGING_WITHDKML}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-xx-console "${PIN_DKML_COMPONENT_XX_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe "${PIN_DKML_EXE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe-lib "${PIN_DKML_EXE_LIB}" diff --git a/test/pc/setup-dkml-windows_x86.ps1 b/test/pc/setup-dkml-windows_x86.ps1 index af4f4bf6..ef3380ac 100644 --- a/test/pc/setup-dkml-windows_x86.ps1 +++ b/test/pc/setup-dkml-windows_x86.ps1 @@ -141,6 +141,45 @@ 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. + +.PARAMETER PIN_DKML_COMPONENT_STAGING_OPAM64 +Environment variable. + +.PARAMETER PIN_DKML_COMPONENT_STAGING_UNIXUTILS +Environment variable. + +.PARAMETER PIN_DKML_COMPONENT_STAGING_WITHDKML +Environment variable. + .PARAMETER PIN_DKML_COMPONENT_XX_CONSOLE Environment variable. @@ -585,6 +624,19 @@ 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" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_STAGING_WITHDKML = "2.0.3" ,[Parameter()] [string] $PIN_DKML_COMPONENT_XX_CONSOLE = "0.1.1" ,[Parameter()] [string] $PIN_DKML_EXE_LIB = "2.0.3" ,[Parameter()] [string] $PIN_DKML_EXE = "2.0.3" @@ -789,6 +841,19 @@ $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 +$env:PIN_DKML_COMPONENT_STAGING_WITHDKML = $PIN_DKML_COMPONENT_STAGING_WITHDKML $env:PIN_DKML_COMPONENT_XX_CONSOLE = $PIN_DKML_COMPONENT_XX_CONSOLE $env:PIN_DKML_EXE_LIB = $PIN_DKML_EXE_LIB $env:PIN_DKML_EXE = $PIN_DKML_EXE @@ -2153,6 +2218,19 @@ 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}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-withdkml "${PIN_DKML_COMPONENT_STAGING_WITHDKML}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-xx-console "${PIN_DKML_COMPONENT_XX_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe "${PIN_DKML_EXE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe-lib "${PIN_DKML_EXE_LIB}" diff --git a/test/pc/setup-dkml-windows_x86_64.ps1 b/test/pc/setup-dkml-windows_x86_64.ps1 index 13bbdaf7..3c7a2a74 100644 --- a/test/pc/setup-dkml-windows_x86_64.ps1 +++ b/test/pc/setup-dkml-windows_x86_64.ps1 @@ -141,6 +141,45 @@ 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. + +.PARAMETER PIN_DKML_COMPONENT_STAGING_OPAM64 +Environment variable. + +.PARAMETER PIN_DKML_COMPONENT_STAGING_UNIXUTILS +Environment variable. + +.PARAMETER PIN_DKML_COMPONENT_STAGING_WITHDKML +Environment variable. + .PARAMETER PIN_DKML_COMPONENT_XX_CONSOLE Environment variable. @@ -585,6 +624,19 @@ 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" + ,[Parameter()] [string] $PIN_DKML_COMPONENT_STAGING_WITHDKML = "2.0.3" ,[Parameter()] [string] $PIN_DKML_COMPONENT_XX_CONSOLE = "0.1.1" ,[Parameter()] [string] $PIN_DKML_EXE_LIB = "2.0.3" ,[Parameter()] [string] $PIN_DKML_EXE = "2.0.3" @@ -788,6 +840,19 @@ $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 +$env:PIN_DKML_COMPONENT_STAGING_WITHDKML = $PIN_DKML_COMPONENT_STAGING_WITHDKML $env:PIN_DKML_COMPONENT_XX_CONSOLE = $PIN_DKML_COMPONENT_XX_CONSOLE $env:PIN_DKML_EXE_LIB = $PIN_DKML_EXE_LIB $env:PIN_DKML_EXE = $PIN_DKML_EXE @@ -2152,6 +2217,19 @@ 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}" + opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-staging-withdkml "${PIN_DKML_COMPONENT_STAGING_WITHDKML}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-component-xx-console "${PIN_DKML_COMPONENT_XX_CONSOLE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe "${PIN_DKML_EXE}" opamrun pin add --switch "$do_pins_NAME" --yes --no-action -k version dkml-exe-lib "${PIN_DKML_EXE_LIB}"