From 32fb0175b4c7a1360c106bf724d67b483bd17657 Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Wed, 9 Jan 2019 09:41:01 -0800 Subject: [PATCH] infra: Support build types. Signed-off-by: Tim 'mithro' Ansell --- Dockerfile | 2 +- cloudbuild.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d90cf860..e7408a7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG NUM_PARALLEL_JOBS=1 COPY . /source RUN cd /source && make -j${NUM_PARALLEL_JOBS} --output-sync=target --warn-undefined-variables build && make env -RUN bash -c ". /source/database/artix7/settings.sh; cd /source/fuzzers && make --output-sync=target --warn-undefined-variables" +RUN bash -c ". /source/database/artix7/settings.sh; cd /source/fuzzers && make --output-sync=target --warn-undefined-variables ${BUILD_TYPE}" #RUN find /source/database -mindepth 1 -maxdepth 1 -type d -exec /source/htmlgen/htmlgen.py --settings={}/settings.sh --output=/output/html \; RUN mkdir -p /output/raw && find /source/database -mindepth 1 -maxdepth 1 -type d -exec cp -R {} /output/raw \; diff --git a/cloudbuild.yaml b/cloudbuild.yaml index db3b73ba..6bb48418 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -6,6 +6,8 @@ steps: - 'DEV_ENV_IMAGE=${_DEV_ENV_IMAGE}' - '--build-arg' - 'NUM_PARALLEL_JOBS=${_NUM_CPUS}' + - '--build-arg' + - 'BUILD_TYPE=${_BUILD_TYPE}' - '-t' - '${_GCR_ZONE}/$PROJECT_ID/${_IMAGE_NAME}:${SHORT_SHA}' - '.' @@ -17,5 +19,6 @@ substitutions: _GCR_ZONE: 'gcr.io' _IMAGE_NAME: 'prjxray-db' _NUM_CPUS: '16' + _BUILD_TYPE: '' images: - '${_GCR_ZONE}/$PROJECT_ID/${_IMAGE_NAME}:${SHORT_SHA}'