From 0ae58dcf264eb4092c02e801e0a23b461f006915 Mon Sep 17 00:00:00 2001 From: Aria Shrimpton Date: Fri, 8 Mar 2024 13:12:04 +0000 Subject: more consistent clearing of stuff --- .gitlab-ci.yml | 2 +- analysis/Justfile | 2 ++ src/Justfile | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c92da0..0a594c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,4 +48,4 @@ comparisons: timeout: 6 hours resource_group: vm script: - - ssh $SSH_LOCATION "bash -lc 'cd /opt/candelabra/src && just selections --compare'" + - ssh $SSH_LOCATION "bash -lc 'cd /opt/candelabra/src && rm -fr tests/target/criterion && just selections --compare'" diff --git a/analysis/Justfile b/analysis/Justfile index 8a4ba79..8200fed 100644 --- a/analysis/Justfile +++ b/analysis/Justfile @@ -9,10 +9,12 @@ fetch-log job outp="current": fetch-cost-models outp="current": mkdir -p {{justfile_directory()}}/{{outp}} + rm -fr {{justfile_directory()}}/{{outp}}/candelabra rsync -ravP candelabra:/opt/candelabra/src/target/candelabra/ {{justfile_directory()}}/{{outp}}/candelabra fetch-comparisons outp="current": mkdir -p {{justfile_directory()}}/{{outp}} + rm -fr {{justfile_directory()}}/{{outp}}/criterion rsync -ravP candelabra:/opt/candelabra/src/tests/target/criterion/ {{justfile_directory()}}/{{outp}}/criterion rm -rf {{justfile_directory()}}/{{outp}}/criterion/report find {{justfile_directory()}}/{{outp}}/criterion -iname '*.svg' -exec rm '{}' \; diff --git a/src/Justfile b/src/Justfile index 9ffb539..0d20a5e 100644 --- a/src/Justfile +++ b/src/Justfile @@ -12,7 +12,6 @@ cost-models: rebuild @IMPLS=`{{candelabra}} list-library 2>&1 | cut -d ']' -f 2 | grep ::`; for impl in $IMPLS; do just cost-model $impl; done selections *SELECTFLAGS: rebuild - rm -fr {{tests_dir}}/target/criterion @cd tests/ && for i in $(ls -d */); do [ "${i%%/}" == "target" ] || just select ${i%%/} {{SELECTFLAGS}}; done rebuild: -- cgit v1.2.3