Commit 8140bd24 authored by David Blyth's avatar David Blyth

Fixed DD4hep multiple input files and update CI

parent ef2b40f2
Pipeline #240 passed with stages
in 49 seconds
...@@ -3,32 +3,27 @@ before_script: ...@@ -3,32 +3,27 @@ before_script:
stages: stages:
- build - build
- build-cleanup
- deploy - deploy
- build_cleanup - cleanup
build_test: build-image:
stage: build stage: build
script: script:
- docker build -t argonneeic/base:$CI_COMMIT_REF_SLUG --build-arg BUILD_THREADS=20 . - bash -c 'if [ "$(docker images -f reference=argonneeic/base:$CI_COMMIT_SHA --format {{.Tag}})" == "" ]; then docker build -t argonneeic/base:$CI_COMMIT_SHA --build-arg BUILD_THREADS=20 .; fi'
except:
- master
build_latest: cleanup-containers:
stage: build stage: build-cleanup
script: script:
- docker build -t argonneeic/base --build-arg BUILD_THREADS=20 . - bash -c 'docker rm $(docker ps -qa --no-trunc --filter "status=exited") || :'
only: when: on_failure
- master
docker_hub_push: deploy-to-dockerhub:
stage: deploy stage: deploy
script: script:
- bash -c 'docker rmi argonneeic/base:latest || :'
- docker tag argonneeic/base:$CI_COMMIT_SHA argonneeic/base
- bash deploy.sh - bash deploy.sh
- docker rmi argonneeic/base:$CI_COMMIT_SHA
only: only:
- master - master
cleanup_docker_containers:
stage: build_cleanup
script:
- docker rm $(docker ps -qa --no-trunc --filter "status=exited")
when: on_failure
...@@ -148,8 +148,8 @@ RUN git clone https://github.com/iLCSoft/LCIO.git \ ...@@ -148,8 +148,8 @@ RUN git clone https://github.com/iLCSoft/LCIO.git \
ENV ROOT_INCLUDE_PATH=/usr/local:/usr/local/include ENV ROOT_INCLUDE_PATH=/usr/local:/usr/local/include
# DD4hep # DD4hep
ENV DD4HEP_CHECKOUT=0e539031db7b74e1874f64f039e02dfc3560a814 \ ENV DD4HEP_CHECKOUT=7c5b178254361ec4e3d97c51f941bce515c85341 \
DD4HEP_REPO=https://github.com/AIDASoft/DD4hep.git DD4HEP_REPO=https://github.com/decibelcooper/DD4hep.git
RUN sudo pacman -S --noconfirm \ RUN sudo pacman -S --noconfirm \
boost \ boost \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment