From 60fe2450a7a9945b28e0a182f81d278c20b78441 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Wed, 12 Aug 2020 10:58:14 +0200 Subject: [PATCH] Try and properly cleanup TaskCluster Workdir --- taskcluster/darwin-opt-base.tyml | 2 +- taskcluster/generic_tc_caching-darwin-opt-base.tyml | 2 +- taskcluster/generic_tc_caching-win-opt-base.tyml | 2 +- taskcluster/test-darwin-opt-base.tyml | 2 +- taskcluster/test-win-cuda-opt-base.tyml | 2 +- taskcluster/test-win-opt-base.tyml | 2 +- taskcluster/win-opt-base.tyml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/taskcluster/darwin-opt-base.tyml b/taskcluster/darwin-opt-base.tyml index 7503fd52..0eee5377 100644 --- a/taskcluster/darwin-opt-base.tyml +++ b/taskcluster/darwin-opt-base.tyml @@ -46,7 +46,7 @@ payload: - > export TASKCLUSTER_ARTIFACTS="$(pwd)/public/" && export TASKCLUSTER_ORIG_TASKDIR="$(pwd)" && - (mkdir ../tc-workdir/ || rm -fr ../tc-workdir/*) && cd ../tc-workdir/ && + (rm -fr ../tc-workdir/ ; mkdir ../tc-workdir/) && cd ../tc-workdir/ && export TASKCLUSTER_TASK_DIR="$(pwd)" && export LC_ALL=C && export MACOSX_DEPLOYMENT_TARGET=10.10 && diff --git a/taskcluster/generic_tc_caching-darwin-opt-base.tyml b/taskcluster/generic_tc_caching-darwin-opt-base.tyml index 70fc55fb..cc091900 100644 --- a/taskcluster/generic_tc_caching-darwin-opt-base.tyml +++ b/taskcluster/generic_tc_caching-darwin-opt-base.tyml @@ -30,7 +30,7 @@ payload: in: > export TASKCLUSTER_ARTIFACTS="$(pwd)/public/" && export TASKCLUSTER_ORIG_TASKDIR="$(pwd)" && - (mkdir ../tc-workdir/ || rm -fr ../tc-workdir/*) && cd ../tc-workdir/ && + (rm -fr ../tc-workdir/ ; mkdir ../tc-workdir/) && cd ../tc-workdir/ && export TASKCLUSTER_TASK_DIR="$(pwd)" && export LC_ALL=C && export MACOSX_DEPLOYMENT_TARGET=10.10 && diff --git a/taskcluster/generic_tc_caching-win-opt-base.tyml b/taskcluster/generic_tc_caching-win-opt-base.tyml index 51a53b92..59e294d5 100644 --- a/taskcluster/generic_tc_caching-win-opt-base.tyml +++ b/taskcluster/generic_tc_caching-win-opt-base.tyml @@ -40,7 +40,7 @@ payload: export PATH=\"$USERPROFILE/msys64/usr/bin:/c/Python36:/c/Program Files/Git/bin:/c/Program Files/7-Zip/:$PATH\" && export TASKCLUSTER_ARTIFACTS=\"$(cygpath -u $USERPROFILE/public)\" && export TASKCLUSTER_TASK_DIR=\"/c/builds/tc-workdir/\" && - (mkdir $TASKCLUSTER_TASK_DIR || rm -fr $TASKCLUSTER_TASK_DIR/*) && + (rm -fr $TASKCLUSTER_TASK_DIR/ ; mkdir $TASKCLUSTER_TASK_DIR) && echo \"export TASKCLUSTER_TASK_EXIT_CODE=0\" > $USERPROFILE/tc-exit.sh && env && pacman --noconfirm -S tar && mkdir -p $TASKCLUSTER_ARTIFACTS/ && if [ \"`curl -sSIL -o /dev/null -w %%{http_code} ${build.cache.artifact_url}`\" != \"200\" ]; then git clone --quiet ${build.build_or_cache.repo} $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir}/ && cd $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir} && git checkout --quiet ${build.build_or_cache.sha} && ${extraSystemConfig} && $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir}/${build.scripts.setup} && $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir}/${build.scripts.build} && $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir}/${build.scripts.package} && $TASKCLUSTER_TASK_DIR/${build.build_or_cache.dir}/taskcluster/tc-update-index.sh ${taskIndexExpire} taskcluster ${build.cache.artifact_namespace}; fi; echo \"export TASKCLUSTER_TASK_EXIT_CODE=$?\" > $USERPROFILE/tc-exit.sh" | cmd /k diff --git a/taskcluster/test-darwin-opt-base.tyml b/taskcluster/test-darwin-opt-base.tyml index d35aef89..0ec4702a 100644 --- a/taskcluster/test-darwin-opt-base.tyml +++ b/taskcluster/test-darwin-opt-base.tyml @@ -46,7 +46,7 @@ then: in: > export TASKCLUSTER_ARTIFACTS="$(pwd)/public/" && export TASKCLUSTER_ORIG_TASKDIR="$(pwd)" && - (mkdir ../tc-workdir/ || rm -fr ../tc-workdir/*) && cd ../tc-workdir/ && + (rm -fr ../tc-workdir/ ; mkdir ../tc-workdir/) && cd ../tc-workdir/ && export TASKCLUSTER_TASK_DIR="$(pwd)" && export TASKCLUSTER_TMP_DIR="$TASKCLUSTER_TASK_DIR/tmp" && export LC_ALL=C && diff --git a/taskcluster/test-win-cuda-opt-base.tyml b/taskcluster/test-win-cuda-opt-base.tyml index 17ee34ae..2094f439 100644 --- a/taskcluster/test-win-cuda-opt-base.tyml +++ b/taskcluster/test-win-cuda-opt-base.tyml @@ -49,7 +49,7 @@ then: export TASKCLUSTER_NODE_DIR=\"$(cygpath -w $TASKCLUSTER_TASK_DIR/bin)\" && export TASKCLUSTER_TMP_DIR="$TASKCLUSTER_TASK_DIR/tmp" && export PIP_DEFAULT_TIMEOUT=60 && - (mkdir $TASKCLUSTER_TASK_DIR || rm -fr $TASKCLUSTER_TASK_DIR/*) && cd $TASKCLUSTER_TASK_DIR && + (rm -fr $TASKCLUSTER_TASK_DIR/ ; mkdir $TASKCLUSTER_TASK_DIR) && cd $TASKCLUSTER_TASK_DIR && env && ln -s $USERPROFILE/msys64 $TASKCLUSTER_TASK_DIR/msys64 && git clone --quiet ${event.head.repo.url} $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/ && diff --git a/taskcluster/test-win-opt-base.tyml b/taskcluster/test-win-opt-base.tyml index 92021d74..eba8e5db 100644 --- a/taskcluster/test-win-opt-base.tyml +++ b/taskcluster/test-win-opt-base.tyml @@ -51,7 +51,7 @@ then: export TASKCLUSTER_NODE_DIR=\"$(cygpath -w $TASKCLUSTER_TASK_DIR/bin)\" && export TASKCLUSTER_TMP_DIR="$TASKCLUSTER_TASK_DIR/tmp" && export PIP_DEFAULT_TIMEOUT=60 && - (mkdir $TASKCLUSTER_TASK_DIR || rm -fr $TASKCLUSTER_TASK_DIR/*) && cd $TASKCLUSTER_TASK_DIR && + (rm -fr $TASKCLUSTER_TASK_DIR/ ; mkdir $TASKCLUSTER_TASK_DIR) && cd $TASKCLUSTER_TASK_DIR && env && ln -s $USERPROFILE/msys64 $TASKCLUSTER_TASK_DIR/msys64 && git clone --quiet ${event.head.repo.url} $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/ && diff --git a/taskcluster/win-opt-base.tyml b/taskcluster/win-opt-base.tyml index 872ab123..5a8cc2b4 100644 --- a/taskcluster/win-opt-base.tyml +++ b/taskcluster/win-opt-base.tyml @@ -44,7 +44,7 @@ payload: export PATH=\"/c/builds/tc-workdir/msys64/usr/bin:/c/Python36:/c/Program Files/Git/bin:/c/Program Files/7-Zip/:/c/Program Files (x86)/Windows Kits/10/bin/x64/:/c/Program Files/dotnet/:$PATH\" && export TASKCLUSTER_ARTIFACTS=\"$USERPROFILE/public\" && export TASKCLUSTER_TASK_DIR=\"/c/builds/tc-workdir/\" && - (mkdir $TASKCLUSTER_TASK_DIR || rm -fr $TASKCLUSTER_TASK_DIR/*) && cd $TASKCLUSTER_TASK_DIR && + (rm -fr $TASKCLUSTER_TASK_DIR/ ; mkdir $TASKCLUSTER_TASK_DIR) && cd $TASKCLUSTER_TASK_DIR && env && ln -s $USERPROFILE/msys64 $TASKCLUSTER_TASK_DIR/msys64 && (7z x -txz -so $USERPROFILE/home.tar.xz | 7z x -aoa -ttar -si ) &&