luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #625 from mithro/cloudbuild 

Cleaning up cloudbuild environment
This commit is contained in:
Tim Ansell 2019-02-08 15:42:59 +11:00 committed by GitHub
parent 2830c4ab88 8415f94813
commit d58cb49121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cloudbuild.yaml → .github/cloudbuild.yaml vendored
View File

@ -6,16 +6,21 @@ steps:
- 'DEV_ENV_IMAGE=${_DEV_ENV_IMAGE}' - 'DEV_ENV_IMAGE=${_DEV_ENV_IMAGE}'
- '--build-arg' - '--build-arg'
- 'NUM_PARALLEL_JOBS=${_NUM_CPUS}' - 'NUM_PARALLEL_JOBS=${_NUM_CPUS}'
- '--build-arg'
- 'BUILD_TYPE=${_BUILD_TYPE}'
- '-t' - '-t'
- '${_GCR_ZONE}/$PROJECT_ID/${_IMAGE_NAME}:${SHORT_SHA}' - '${_GCR_ZONE}/$PROJECT_ID/${_IMAGE_NAME}:${SHORT_SHA}'
- '-f'
- '.github/cloudbuild/Dockerfile'
- '.' - '.'
options: options:
disk_size_gb: 1000 disk_size_gb: 1000
machine_type: N1_HIGHCPU_32 machine_type: N1_HIGHCPU_32
timeout: '21600s' timeout: '24h0m0s'
substitutions: substitutions:
_GCR_ZONE: 'gcr.io' _GCR_ZONE: 'gcr.io'
_IMAGE_NAME: 'prjxray-db' _IMAGE_NAME: 'prjxray-db'
_NUM_CPUS: '16' _NUM_CPUS: '16'
_BUILD_TYPE: ''
images: images:
- '${_GCR_ZONE}/$PROJECT_ID/${_IMAGE_NAME}:${SHORT_SHA}' - '${_GCR_ZONE}/$PROJECT_ID/${_IMAGE_NAME}:${SHORT_SHA}'

2
Dockerfile → .github/cloudbuild/Dockerfile vendored
View File

@ -5,7 +5,7 @@ ARG NUM_PARALLEL_JOBS=1
COPY . /source COPY . /source
RUN cd /source && make -j${NUM_PARALLEL_JOBS} --output-sync=target --warn-undefined-variables build && make env 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 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 \; RUN mkdir -p /output/raw && find /source/database -mindepth 1 -maxdepth 1 -type d -exec cp -R {} /output/raw \;