Skip to content

Commit e40412a

Browse files
committed
Fixed to be used with CONAN_USER_HOME env var
1 parent ae3ab70 commit e40412a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.ci/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ endif
2222

2323
MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG:=
2424
ifdef MAP_CONAN_HOME_TO_DOCKER_HOST
25-
MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG:=-v "${MAP_CONAN_HOME_TO_DOCKER_HOST}:/home/build/.conan"
25+
MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG:=-v "${MAP_CONAN_HOME_TO_DOCKER_HOST}:/conan_user_home"
2626
endif
2727

2828
CURRENT_UID := $(shell id -u)
@@ -53,6 +53,7 @@ build:
5353
-v $(PWD):/source \
5454
${MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG} \
5555
-w /source/agent/native \
56+
-e CONAN_USER_HOME=/conan_user_home \
5657
elasticobservability/apm-agent-php-dev:native-build-gcc-12.2.0-$(BUILD_ARCHITECTURE)-0.0.2 \
5758
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"
5859
@echo "::endgroup::"

0 commit comments

Comments
 (0)