From 1fdb5fb6bb93dc21203c4eddf1d649035417df06 Mon Sep 17 00:00:00 2001 From: viferga Date: Thu, 23 Jan 2020 12:48:52 -0900 Subject: [PATCH] Update to new way of obtaining metacall path. --- tests/c/Dockerfile | 10 ++++++++-- tests/cli/Dockerfile | 2 +- tests/node/Dockerfile | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/c/Dockerfile b/tests/c/Dockerfile index c1a0621..433a05d 100644 --- a/tests/c/Dockerfile +++ b/tests/c/Dockerfile @@ -39,8 +39,14 @@ COPY tests/scripts/ /scripts/ ARG CACHE_INVALIDATE -RUN export METACALL_PATH="`find /gnu/store/ -type d -name '*metacall*[^R]' | head -n 1`" \ - && echo "Running tests ${CACHE_INVALIDATE}" \ +RUN echo "Running tests ${CACHE_INVALIDATE}" \ + && export LOADER_SCRIPT_PATH="/scripts/" \ + && export METACALL_PATH="/gnu/store/`ls /gnu/store/ | grep metacall | head -n 1`" \ + && export LOADER_LIBRARY_PATH="${METACALL_PATH}/lib" \ + && export SERIAL_LIBRARY_PATH="${METACALL_PATH}/lib" \ + && export DETOUR_LIBRARY_PATH="${METACALL_PATH}/lib" \ + && export PORT_LIBRARY_PATH="${METACALL_PATH}/lib" \ + && export CONFIGURATIONS_PATH="${METACALL_PATH}/configurations/global.json" \ && cd / \ && gcc \ -I$METACALL_PATH/include \ diff --git a/tests/cli/Dockerfile b/tests/cli/Dockerfile index 33705c9..e9a5375 100644 --- a/tests/cli/Dockerfile +++ b/tests/cli/Dockerfile @@ -39,7 +39,7 @@ ARG CACHE_INVALIDATE RUN echo "Running tests ${CACHE_INVALIDATE}" \ && export LOADER_SCRIPT_PATH="/scripts/" \ - && export METACALL_PATH="`find /gnu/store/ -type d -name '*metacall*[^R]' | head -n 1`" \ + && export METACALL_PATH="/gnu/store/`ls /gnu/store/ | grep metacall | head -n 1`" \ && export LOADER_LIBRARY_PATH="${METACALL_PATH}/lib" \ && export SERIAL_LIBRARY_PATH="${METACALL_PATH}/lib" \ && export DETOUR_LIBRARY_PATH="${METACALL_PATH}/lib" \ diff --git a/tests/node/Dockerfile b/tests/node/Dockerfile index c4a1477..1f6acf1 100644 --- a/tests/node/Dockerfile +++ b/tests/node/Dockerfile @@ -44,7 +44,7 @@ RUN echo "Running tests ${CACHE_INVALIDATE}" \ && /gnu/bin/node /gnu/bin/npm install metacall RUN export LOADER_SCRIPT_PATH="/scripts/" \ - && export METACALL_PATH="`find /gnu/store/ -type d -name '*metacall*[^R]' | head -n 1`" \ + && export METACALL_PATH="/gnu/store/`ls /gnu/store/ | grep metacall | head -n 1`" \ && export LOADER_LIBRARY_PATH="${METACALL_PATH}/lib" \ && export SERIAL_LIBRARY_PATH="${METACALL_PATH}/lib" \ && export DETOUR_LIBRARY_PATH="${METACALL_PATH}/lib" \