From 3be32afcb5c3773aa96a37c21816337a2e9c0cc4 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Mon, 8 Jan 2024 21:01:52 +0000 Subject: [PATCH] CI: fix & speedup build --- .github/workflows/docker.yml | 2 -- docker/compose.sh | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cce454f0..279daf75 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -27,8 +27,6 @@ jobs: type: [gpu, cpu] steps: - uses: actions/checkout@v3 - - run: sudo .github/workflows/install_docker.sh - - run: sudo .github/workflows/GHA_increase_disk_space.sh - name: cache uses: actions/cache@v3 with: diff --git a/docker/compose.sh b/docker/compose.sh index 00fcb54c..fc3e21fb 100755 --- a/docker/compose.sh +++ b/docker/compose.sh @@ -38,6 +38,12 @@ DCC_GPU="docker compose -f docker-compose.yml -f docker/docker-compose.gpu.yml" pushd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")" git submodule update --init --recursive +echo build base stack +for image in foundation base minimal scipy; do + test $build_cpu = 1 && $DCC_CPU build "$@" $image + test $build_gpu = 1 && $DCC_GPU build "$@" $image +done + echo build ccache test $build_cpu = 1 && $DCC_CPU build "$@" sirf-build test $build_gpu = 1 && $DCC_GPU build "$@" sirf-build