Avoid task_TIMESTAMP use on macOS generic-worker

mozilla · Oct 16, 2018 · ab3446d · ab3446d
1 parent 3747d2d
commit ab3446d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/taskcluster/darwin-opt-base.tyml b/taskcluster/darwin-opt-base.tyml
@@ -42,15 +42,19 @@ payload:
       - "-cxe"
       - >
         export TASKCLUSTER_ARTIFACTS="$(pwd)/public/" &&
+        (mkdir ../tc-workdir/ || rm -fr ../tc-workdir/*) && cd ../tc-workdir/ &&
         export TASKCLUSTER_TASK_DIR="$(pwd)" &&
+        export LC_ALL=C &&
+        export MACOSX_DEPLOYMENT_TARGET=10.10 &&
         mkdir -p $TASKCLUSTER_TASK_DIR/DeepSpeech/ &&
         env &&
         git clone --quiet ${event.head.repo.url} $TASKCLUSTER_TASK_DIR/DeepSpeech/tf/ &&
         cd $TASKCLUSTER_TASK_DIR/DeepSpeech/tf && git checkout --quiet ${event.head.sha} && cd $TASKCLUSTER_TASK_DIR &&
         $TASKCLUSTER_TASK_DIR/DeepSpeech/tf/tc-brew.sh &&
         $TASKCLUSTER_TASK_DIR/DeepSpeech/tf/tc-setup.sh &&
         $TASKCLUSTER_TASK_DIR/DeepSpeech/tf/tc-build.sh &&
-        $TASKCLUSTER_TASK_DIR/DeepSpeech/tf/tc-package.sh
+        $TASKCLUSTER_TASK_DIR/DeepSpeech/tf/tc-package.sh ;
+        cd $TASKCLUSTER_TASK_DIR/../ && rm -fr tc-workdir/
 
   artifacts:
     - type: "directory"

diff --git a/tc-brew.sh b/tc-brew.sh
@@ -18,7 +18,7 @@ mkdir -p "${HOMEBREW_CACHE}" || true
 
 # Make sure to verify there is a 'brew' binary there, otherwise install things.
 if [ ! -x "${LOCAL_BREW}/bin/brew" ]; then
-    curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C "${LOCAL_BREW}"
+    curl -L https://github.com/Homebrew/brew/tarball/1.7.7 | tar xz --strip 1 -C "${LOCAL_BREW}"
 fi;
 
 echo "local brew list (should be empty) ..."