Update to new way of obtaining metacall path.

metacall · Jan 23, 2020 · 1fdb5fb · 1fdb5fb
1 parent 83197a5
commit 1fdb5fb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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" \