Merge branch 'Config_to_cache_conan' into 918_modernbuild_draft_centos

elastic · Jun 29, 2023 · f95cf47 · f95cf47
2 parents fe5bdd1 + 1f0ae4a
commit f95cf47
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/.ci/Makefile b/.ci/Makefile
@@ -18,9 +18,10 @@ ifeq ($(DOCKERFILE), Dockerfile.alpine)
     SUFFIX := -alpine
 endif
 
+CONAN_USER_HOME:=/tmp/conan_user_home
 MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG:=
 ifdef MAP_CONAN_HOME_TO_DOCKER_HOST
-    MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG:=-v "${MAP_CONAN_HOME_TO_DOCKER_HOST}:/conan_user_home"
+    MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG:=-v "${MAP_CONAN_HOME_TO_DOCKER_HOST}:$(CONAN_USER_HOME)"
 endif
 
 CURRENT_UID := $(shell id -u)
@@ -50,9 +51,11 @@ build:
 		-v $(PWD):/source \
 		${MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG} \
 		-w /source/agent/native \
-		-e CONAN_USER_HOME=/conan_user_home \
+		-e CONAN_USER_HOME=$(CONAN_USER_HOME) \
 		elasticobservability/apm-agent-php-dev:native-build-gcc-12.2.0-$(BUILD_ARCHITECTURE)-0.0.2 \
-		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"
+		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"
 	@echo "::endgroup::"
 
 .PHONY: static-check-unit-test