From 733c39906a4dbdd2a87e67346e097ab02946a961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BCrk?= Date: Mon, 2 Jun 2025 15:07:30 +0200 Subject: [PATCH] [TASK] Make it possible to have deepl-base symlinked in `packages/` This change makes it possible to have `deepl-base` symlinked within the `packages` folder and `Build/Scripts/runTests.sh` mounting the volumn using full path locally and in containers. That allows using deepl-base from checkout repository within the private monorepository like setup without needing to have changes pushed to github (locally). --- .gitignore | 1 + Build/Scripts/runTests.sh | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 48dcbca1..d422b0b1 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ Build/node_modules/ vendor tailor-version-artefact/ tailor-version-upload/ +/packages/deepl-base diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh index 8331c0bf..db3df807 100755 --- a/Build/Scripts/runTests.sh +++ b/Build/Scripts/runTests.sh @@ -448,16 +448,23 @@ SUFFIX=$(echo $RANDOM) NETWORK="wv-deepltranslate-${SUFFIX}" ${CONTAINER_BIN} network create ${NETWORK} >/dev/null +DEEPL_BASE_MOUNT="" +if [[ -d "${ROOT_DIR}/packages/deepl-base" ]]; then + echo ">> Use symlinked deepl-base (for example monorepo)" + DEEPL_BASE_PATH="$( readlink -f ${ROOT_DIR}/packages/deepl-base )" + DEEPL_BASE_MOUNT="-v ${DEEPL_BASE_PATH}:${DEEPL_BASE_PATH}" +fi + if [ "${CONTAINER_BIN}" == "docker" ]; then # docker needs the add-host for xdebug remote debugging. podman has host.container.internal built in - CONTAINER_COMMON_PARAMS="${CONTAINER_INTERACTIVE} --rm --network ${NETWORK} --add-host ${CONTAINER_HOST}:host-gateway ${USERSET} -v ${ROOT_DIR}:${ROOT_DIR} -w ${ROOT_DIR}" - CONTAINER_SIMPLE_PARAMS="${CONTAINER_INTERACTIVE} --rm --network ${NETWORK} --add-host ${CONTAINER_HOST}:host-gateway ${USERSET} -v ${ROOT_DIR}:${ROOT_DIR} -w ${ROOT_DIR}" + CONTAINER_COMMON_PARAMS="${CONTAINER_INTERACTIVE} --rm --network ${NETWORK} --add-host ${CONTAINER_HOST}:host-gateway ${USERSET} -v ${ROOT_DIR}:${ROOT_DIR} ${DEEPL_BASE_MOUNT} -w ${ROOT_DIR}" + CONTAINER_SIMPLE_PARAMS="${CONTAINER_INTERACTIVE} --rm --network ${NETWORK} --add-host ${CONTAINER_HOST}:host-gateway ${USERSET} -v ${ROOT_DIR}:${ROOT_DIR} ${DEEPL_BASE_MOUNT} -w ${ROOT_DIR}" DOCUMENTATION_COMMON_PARAMS="${CONTAINER_INTERACTIVE} --rm ${USERSET} -v ${ROOT_DIR}:/project" else # podman CONTAINER_HOST="host.containers.internal" - CONTAINER_COMMON_PARAMS="${CONTAINER_INTERACTIVE} ${CI_PARAMS} --rm --network ${NETWORK} -v ${ROOT_DIR}:${ROOT_DIR} -w ${ROOT_DIR}" - CONTAINER_SIMPLE_PARAMS="${CONTAINER_INTERACTIVE} ${CI_PARAMS} --rm -v ${ROOT_DIR}:${ROOT_DIR} -w ${ROOT_DIR}" + CONTAINER_COMMON_PARAMS="${CONTAINER_INTERACTIVE} ${CI_PARAMS} --rm --network ${NETWORK} -v ${ROOT_DIR}:${ROOT_DIR} ${DEEPL_BASE_MOUNT} -w ${ROOT_DIR}" + CONTAINER_SIMPLE_PARAMS="${CONTAINER_INTERACTIVE} ${CI_PARAMS} --rm -v ${ROOT_DIR}:${ROOT_DIR} ${DEEPL_BASE_MOUNT} -w ${ROOT_DIR}" DOCUMENTATION_COMMON_PARAMS="${CONTAINER_INTERACTIVE} ${CI_PARAMS} --rm -v ${ROOT_DIR}:${ROOT_DIR} -v ${ROOT_DIR}:/project" fi