File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -18,9 +18,10 @@ ifeq ($(DOCKERFILE), Dockerfile.alpine)
1818 SUFFIX := -alpine
1919endif
2020
21+ CONAN_USER_HOME: =/tmp/conan_user_home
2122MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG: =
2223ifdef MAP_CONAN_HOME_TO_DOCKER_HOST
23- MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG: =-v "${MAP_CONAN_HOME_TO_DOCKER_HOST}:/conan_user_home "
24+ MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG: =-v "${MAP_CONAN_HOME_TO_DOCKER_HOST}:$( CONAN_USER_HOME ) "
2425endif
2526
2627CURRENT_UID := $(shell id -u)
@@ -50,9 +51,11 @@ build:
5051 -v $(PWD ) :/source \
5152 ${MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG} \
5253 -w /source/agent/native \
53- -e CONAN_USER_HOME=/conan_user_home \
54+ -e CONAN_USER_HOME=$( CONAN_USER_HOME ) \
5455 elasticobservability/apm-agent-php-dev:native-build-gcc-12.2.0-$(BUILD_ARCHITECTURE ) -0.0.2 \
55- sh -c " cmake --preset $( BUILD_ARCHITECTURE) -release && cmake --build --preset $( BUILD_ARCHITECTURE) -release && /source/agent/native/_build/$( BUILD_ARCHITECTURE) -release/ext/unit_tests/unit_tests"
56+ sh -c " cmake --preset $( BUILD_ARCHITECTURE) -release \
57+ && cmake --build --preset $(BUILD_ARCHITECTURE ) -release \
58+ && /source/agent/native/_build/$(BUILD_ARCHITECTURE ) -release/ext/unit_tests/unit_tests"
5659 @echo " ::endgroup::"
5760
5861.PHONY : static-check-unit-test
You can’t perform that action at this time.
0 commit comments