From e90732e7adc7d013b95de681a12e3f1a719fc58b Mon Sep 17 00:00:00 2001 From: Jonah Beckford <71855677+jonahbeckford@users.noreply.github.com> Date: Wed, 13 Sep 2023 17:18:34 -0700 Subject: [PATCH] Bump package lists --- src/logic/model.ml | 9 ----- src/scripts/setup-dkml.sh | 9 ----- test/gh-darwin/post/action.yml | 9 ----- test/gh-darwin/pre/action.yml | 20 +--------- test/gh-linux/post/action.yml | 9 ----- test/gh-linux/pre/action.yml | 20 +--------- test/gh-windows/post/action.yml | 9 ----- test/gh-windows/pre/action.yml | 20 +--------- test/gl/setup-dkml.gitlab-ci.yml | 36 ------------------ test/pc/setup-dkml-darwin_x86_64.sh | 45 ---------------------- test/pc/setup-dkml-linux_x86.sh | 45 ---------------------- test/pc/setup-dkml-linux_x86_64.sh | 45 ---------------------- test/pc/setup-dkml-windows_x86.ps1 | 54 --------------------------- test/pc/setup-dkml-windows_x86_64.ps1 | 54 --------------------------- 14 files changed, 3 insertions(+), 381 deletions(-) diff --git a/src/logic/model.ml b/src/logic/model.ml index f5045f46..3f7df4cd 100755 --- a/src/logic/model.ml +++ b/src/logic/model.ml @@ -46,15 +46,8 @@ 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"); @@ -66,8 +59,6 @@ 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_NETWORK", "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 eab25e5a..8fbb3c6d 100755 --- a/src/scripts/setup-dkml.sh +++ b/src/scripts/setup-dkml.sh @@ -938,15 +938,8 @@ 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}" @@ -958,8 +951,6 @@ 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-network "${PIN_DKML_INSTALLER_OCAML_NETWORK}" - 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 0de5ee5d..6f9c3c0a 100644 --- a/test/gh-darwin/post/action.yml +++ b/test/gh-darwin/post/action.yml @@ -83,15 +83,8 @@ 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' @@ -103,8 +96,6 @@ 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_NETWORK: '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 6be4a6b2..be497258 100644 --- a/test/gh-darwin/pre/action.yml +++ b/test/gh-darwin/pre/action.yml @@ -1268,15 +1268,8 @@ 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}" @@ -1288,8 +1281,6 @@ 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-network "${PIN_DKML_INSTALLER_OCAML_NETWORK}" - 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}" @@ -1768,7 +1759,7 @@ runs: shell: bash run: | set -x - echo 'f56320-${{ 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 '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 '${{ 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 @@ -1868,15 +1859,8 @@ 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' @@ -1888,8 +1872,6 @@ 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_NETWORK: '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 8b3a02b9..5f81143a 100644 --- a/test/gh-linux/post/action.yml +++ b/test/gh-linux/post/action.yml @@ -99,15 +99,8 @@ 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' @@ -119,8 +112,6 @@ 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_NETWORK: '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 0abd61a3..2dcd2b25 100644 --- a/test/gh-linux/pre/action.yml +++ b/test/gh-linux/pre/action.yml @@ -1296,15 +1296,8 @@ 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}" @@ -1316,8 +1309,6 @@ 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-network "${PIN_DKML_INSTALLER_OCAML_NETWORK}" - 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}" @@ -1796,7 +1787,7 @@ runs: shell: bash run: | set -x - echo 'f56320-${{ 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 '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 '${{ 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 @@ -1927,15 +1918,8 @@ 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' @@ -1947,8 +1931,6 @@ 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_NETWORK: '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 352383ee..bfc67766 100644 --- a/test/gh-windows/post/action.yml +++ b/test/gh-windows/post/action.yml @@ -112,15 +112,8 @@ 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' @@ -132,8 +125,6 @@ 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_NETWORK: '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 17523a5e..11c829a8 100644 --- a/test/gh-windows/pre/action.yml +++ b/test/gh-windows/pre/action.yml @@ -1329,15 +1329,8 @@ 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}" @@ -1349,8 +1342,6 @@ 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-network "${PIN_DKML_INSTALLER_OCAML_NETWORK}" - 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}" @@ -1967,7 +1958,7 @@ runs: shell: bash run: | set -x - echo 'f56320-${{ 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 '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 '${{ 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 @@ -2099,15 +2090,8 @@ 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' @@ -2119,8 +2103,6 @@ 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_NETWORK: '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 d46073b5..304c5bd8 100644 --- a/test/gl/setup-dkml.gitlab-ci.yml +++ b/test/gl/setup-dkml.gitlab-ci.yml @@ -48,15 +48,8 @@ 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' @@ -68,8 +61,6 @@ 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_NETWORK: '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' @@ -1532,15 +1523,8 @@ 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}" @@ -1552,8 +1536,6 @@ 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-network "${PIN_DKML_INSTALLER_OCAML_NETWORK}" - 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}" @@ -3521,15 +3503,8 @@ 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}" @@ -3541,8 +3516,6 @@ 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-network "${PIN_DKML_INSTALLER_OCAML_NETWORK}" - 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}" @@ -5228,15 +5201,8 @@ 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}" @@ -5248,8 +5214,6 @@ 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-network "${PIN_DKML_INSTALLER_OCAML_NETWORK}" - 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 b70d017d..9dcd1a23 100644 --- a/test/pc/setup-dkml-darwin_x86_64.sh +++ b/test/pc/setup-dkml-darwin_x86_64.sh @@ -53,15 +53,8 @@ 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' @@ -73,8 +66,6 @@ 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_NETWORK='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' @@ -260,15 +251,8 @@ 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 @@ -280,8 +264,6 @@ 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_NETWORK=. Defaults to: ${PIN_DKML_INSTALLER_OCAML_NETWORK}" >&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 @@ -506,24 +488,10 @@ 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" ;; @@ -546,10 +514,6 @@ 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_NETWORK) fail "Option \"$OPTARG\" missing argument" ;; - PIN_DKML_INSTALLER_OCAML_NETWORK=*) PIN_DKML_INSTALLER_OCAML_NETWORK=${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" ;; @@ -1979,15 +1943,8 @@ 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}" @@ -1999,8 +1956,6 @@ 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-network "${PIN_DKML_INSTALLER_OCAML_NETWORK}" - 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 11f7eae6..29a9070c 100644 --- a/test/pc/setup-dkml-linux_x86.sh +++ b/test/pc/setup-dkml-linux_x86.sh @@ -57,15 +57,8 @@ 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' @@ -77,8 +70,6 @@ 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_NETWORK='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' @@ -267,15 +258,8 @@ 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 @@ -287,8 +271,6 @@ 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_NETWORK=. Defaults to: ${PIN_DKML_INSTALLER_OCAML_NETWORK}" >&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 @@ -513,24 +495,10 @@ 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" ;; @@ -553,10 +521,6 @@ 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_NETWORK) fail "Option \"$OPTARG\" missing argument" ;; - PIN_DKML_INSTALLER_OCAML_NETWORK=*) PIN_DKML_INSTALLER_OCAML_NETWORK=${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" ;; @@ -1986,15 +1950,8 @@ 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}" @@ -2006,8 +1963,6 @@ 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-network "${PIN_DKML_INSTALLER_OCAML_NETWORK}" - 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 5b34d648..7a21d13d 100644 --- a/test/pc/setup-dkml-linux_x86_64.sh +++ b/test/pc/setup-dkml-linux_x86_64.sh @@ -57,15 +57,8 @@ 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' @@ -77,8 +70,6 @@ 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_NETWORK='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' @@ -267,15 +258,8 @@ 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 @@ -287,8 +271,6 @@ 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_NETWORK=. Defaults to: ${PIN_DKML_INSTALLER_OCAML_NETWORK}" >&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 @@ -513,24 +495,10 @@ 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" ;; @@ -553,10 +521,6 @@ 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_NETWORK) fail "Option \"$OPTARG\" missing argument" ;; - PIN_DKML_INSTALLER_OCAML_NETWORK=*) PIN_DKML_INSTALLER_OCAML_NETWORK=${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" ;; @@ -1986,15 +1950,8 @@ 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}" @@ -2006,8 +1963,6 @@ 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-network "${PIN_DKML_INSTALLER_OCAML_NETWORK}" - 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 0f3ea18a..43fb7eeb 100644 --- a/test/pc/setup-dkml-windows_x86.ps1 +++ b/test/pc/setup-dkml-windows_x86.ps1 @@ -141,33 +141,12 @@ 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. @@ -201,12 +180,6 @@ Environment variable. .PARAMETER PIN_DKML_INSTALLER_OCAML_COMMON Environment variable. -.PARAMETER PIN_DKML_INSTALLER_OCAML_NETWORK -Environment variable. - -.PARAMETER PIN_DKML_INSTALLER_OCAML_OFFLINE -Environment variable. - .PARAMETER PIN_DKML_PACKAGE_CONSOLE Environment variable. @@ -630,15 +603,8 @@ 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" @@ -650,8 +616,6 @@ 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_NETWORK = "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" @@ -849,15 +813,8 @@ $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 @@ -869,8 +826,6 @@ $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_NETWORK = $PIN_DKML_INSTALLER_OCAML_NETWORK -$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 @@ -2228,15 +2183,8 @@ 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}" @@ -2248,8 +2196,6 @@ 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-network "${PIN_DKML_INSTALLER_OCAML_NETWORK}" - 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 77484380..396bcba9 100644 --- a/test/pc/setup-dkml-windows_x86_64.ps1 +++ b/test/pc/setup-dkml-windows_x86_64.ps1 @@ -141,33 +141,12 @@ 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. @@ -201,12 +180,6 @@ Environment variable. .PARAMETER PIN_DKML_INSTALLER_OCAML_COMMON Environment variable. -.PARAMETER PIN_DKML_INSTALLER_OCAML_NETWORK -Environment variable. - -.PARAMETER PIN_DKML_INSTALLER_OCAML_OFFLINE -Environment variable. - .PARAMETER PIN_DKML_PACKAGE_CONSOLE Environment variable. @@ -630,15 +603,8 @@ 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" @@ -650,8 +616,6 @@ 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_NETWORK = "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" @@ -848,15 +812,8 @@ $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 @@ -868,8 +825,6 @@ $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_NETWORK = $PIN_DKML_INSTALLER_OCAML_NETWORK -$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 @@ -2227,15 +2182,8 @@ 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}" @@ -2247,8 +2195,6 @@ 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-network "${PIN_DKML_INSTALLER_OCAML_NETWORK}" - 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}"