From 76cc393520c9d3f8b39d79766908354584402fc7 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Tue, 25 May 2021 18:55:06 +0200 Subject: [PATCH] earthly conf file, return correct exit code --- ci/earthly-conf.yml | 2 ++ ci/safe-earthly-test-all.sh | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 ci/earthly-conf.yml diff --git a/ci/earthly-conf.yml b/ci/earthly-conf.yml new file mode 100644 index 0000000000..48e32bbc58 --- /dev/null +++ b/ci/earthly-conf.yml @@ -0,0 +1,2 @@ +global: + cache_size_mb: 25000 \ No newline at end of file diff --git a/ci/safe-earthly-test-all.sh b/ci/safe-earthly-test-all.sh index 2b1abaee97..dbd03d6c79 100755 --- a/ci/safe-earthly-test-all.sh +++ b/ci/safe-earthly-test-all.sh @@ -3,7 +3,8 @@ LOG_FILE="earthly_log.txt" touch $LOG_FILE -script -efq $LOG_FILE -c "earthly --buildkit-cache-size-mb 25000 +test-all" +script -efq $LOG_FILE -c "earthly --config ci/earthly-conf.yml +test-all" +EXIT_CODE=$? if grep -q "failed to mount" "$LOG_FILE"; then echo "" @@ -13,7 +14,7 @@ if grep -q "failed to mount" "$LOG_FILE"; then echo "------<<<<<>>>>>------" echo "" echo "" - earthly --no-cache --buildkit-cache-size-mb 25000 +test-all + earthly --config ci/earthly-conf.yml --no-cache +test-all else - return 1 + exit $EXIT_CODE fi