From c365b030c8c895f56f6b1dd6a411901c4ec3a115 Mon Sep 17 00:00:00 2001 From: Alvin Moore Date: Tue, 12 Feb 2019 17:01:04 -0800 Subject: [PATCH] Added support for variable build directory --- build/docker-compose.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build/docker-compose.yaml b/build/docker-compose.yaml index 90ba9936c4..dd3561d5e5 100644 --- a/build/docker-compose.yaml +++ b/build/docker-compose.yaml @@ -12,12 +12,14 @@ services: working_dir: /foundationdb environment: - MAKEJOBS=1 + - BUILD_DIR=./work release-setup: &release-setup <<: *build-setup environment: - MAKEJOBS=1 - RELEASE=true + - BUILD_DIR=./work snapshot-setup: &snapshot-setup <<: *build-setup @@ -53,7 +55,7 @@ services: snapshot-cmake: &snapshot-cmake <<: *build-setup - command: bash -c 'if [ -f CMakeLists.txt ]; then mkdir -p work && cd work && cmake .. && make -j "$${MAKEJOBS}"; fi' + command: bash -c 'if [ -f CMakeLists.txt ]; then mkdir -p "$${BUILD_DIR}" && cd "$${BUILD_DIR}" && cmake .. && make -j "$${MAKEJOBS}"; fi' prb-cmake: <<: *snapshot-cmake @@ -61,7 +63,7 @@ services: snapshot-ctest: &snapshot-ctest <<: *build-setup - command: bash -c 'if [ -f CMakeLists.txt ]; then mkdir -p work && cd work && cmake .. && make -j "$${MAKEJOBS}" && ctest -L fast -j "$${MAKEJOBS}" --output-on-failure; fi' + command: bash -c 'if [ -f CMakeLists.txt ]; then mkdir -p "$${BUILD_DIR}" && cd "$${BUILD_DIR}" && cmake .. && make -j "$${MAKEJOBS}" && ctest -L fast -j "$${MAKEJOBS}" --output-on-failure; fi' prb-ctest: <<: *snapshot-ctest @@ -69,7 +71,7 @@ services: snapshot-correctness: &snapshot-correctness <<: *build-setup - command: bash -c 'if [ -f CMakeLists.txt ]; then mkdir -p work && cd work && cmake .. && make -j "$${MAKEJOBS}" && ctest -j "$${MAKEJOBS}" --output-on-failure; fi' + command: bash -c 'if [ -f CMakeLists.txt ]; then mkdir -p "$${BUILD_DIR}" && cd "$${BUILD_DIR}" && cmake .. && make -j "$${MAKEJOBS}" && ctest -j "$${MAKEJOBS}" --output-on-failure; fi' prb-correctness: <<: *snapshot-correctness