Skip to content

Commit 1f0ae4a

Browse files
committed
Fixed conan_user_home location
1 parent e40412a commit 1f0ae4a

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

.ci/Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ ifeq ($(DOCKERFILE), Dockerfile.alpine)
2020
ADD_LIBUNWIND_DEPENDENCY_BUILD_ARG_OPT:=--build-arg ADD_LIBUNWIND_DEPENDENCY=${ADD_LIBUNWIND_DEPENDENCY}
2121
endif
2222

23+
CONAN_USER_HOME:=/tmp/conan_user_home
2324
MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG:=
2425
ifdef MAP_CONAN_HOME_TO_DOCKER_HOST
25-
MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG:=-v "${MAP_CONAN_HOME_TO_DOCKER_HOST}:/conan_user_home"
26+
MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG:=-v "${MAP_CONAN_HOME_TO_DOCKER_HOST}:$(CONAN_USER_HOME)"
2627
endif
2728

2829
CURRENT_UID := $(shell id -u)
@@ -53,9 +54,11 @@ build:
5354
-v $(PWD):/source \
5455
${MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG} \
5556
-w /source/agent/native \
56-
-e CONAN_USER_HOME=/conan_user_home \
57+
-e CONAN_USER_HOME=$(CONAN_USER_HOME) \
5758
elasticobservability/apm-agent-php-dev:native-build-gcc-12.2.0-$(BUILD_ARCHITECTURE)-0.0.2 \
58-
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"
59+
sh -c "cmake --preset $(BUILD_ARCHITECTURE)-release \
60+
&& cmake --build --preset $(BUILD_ARCHITECTURE)-release \
61+
&& /source/agent/native/_build/$(BUILD_ARCHITECTURE)-release/ext/unit_tests/unit_tests"
5962
@echo "::endgroup::"
6063

6164
.PHONY: static-check-unit-test

0 commit comments

Comments
 (0)