Skip to content

Commit f95cf47

Browse files
committed
Merge branch 'Config_to_cache_conan' into 918_modernbuild_draft_centos
2 parents fe5bdd1 + 1f0ae4a commit f95cf47

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
@@ -18,9 +18,10 @@ ifeq ($(DOCKERFILE), Dockerfile.alpine)
1818
SUFFIX := -alpine
1919
endif
2020

21+
CONAN_USER_HOME:=/tmp/conan_user_home
2122
MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG:=
2223
ifdef 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)"
2425
endif
2526

2627
CURRENT_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

0 commit comments

Comments
 (0)