Skip to content

Commit

Permalink
Merge pull request mozilla#2437 from mozilla/update-brew
Browse files Browse the repository at this point in the history
Update Homebrew to 2.1.14
  • Loading branch information
reuben authored Oct 16, 2019
2 parents 82fcaa5 + 4d5c9d1 commit 6eebdda
Show file tree
Hide file tree
Showing 22 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion taskcluster/.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ build:
tests_cmdline: ''
convert_graphdef: ''
benchmark_model_bin: ''
tensorflow_git_desc: 'TensorFlow: v1.14.0-16-g3b4ce37'
tensorflow_git_desc: 'TensorFlow: v1.14.0-18-g351a98a'
2 changes: 1 addition & 1 deletion taskcluster/android-arm64-cpu-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build:
system_config:
>
${swig.patch_nodejs.linux}
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.android-arm64/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.android-arm64/artifacts/public/home.tar.xz"
scripts:
build: "taskcluster/android-build.sh arm64-v8a"
package: "taskcluster/android-package.sh arm64-v8a"
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/android-armv7-cpu-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build:
system_config:
>
${swig.patch_nodejs.linux}
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.android-armv7/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.android-armv7/artifacts/public/home.tar.xz"
scripts:
build: "taskcluster/android-build.sh armeabi-v7a"
package: "taskcluster/android-package.sh armeabi-v7a"
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/android-java-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ build:
system_setup:
>
apt-get -qq -y install curl && ${swig.packages.install_script}
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.android-armv7/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.android-armv7/artifacts/public/home.tar.xz"
scripts:
build: "taskcluster/android-apk-build.sh"
package: "taskcluster/android-apk-package.sh"
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/android-x86_64-cpu-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build:
system_config:
>
${swig.patch_nodejs.linux}
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.android-arm64/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.android-arm64/artifacts/public/home.tar.xz"
scripts:
build: "taskcluster/android-build.sh x86_64"
package: "taskcluster/android-package.sh x86_64"
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/darwin-amd64-cpu-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build:
- "index.project.deepspeech.deepspeech.native_client.osx.${event.head.sha}"
- "notify.irc-channel.${notifications.irc}.on-exception"
- "notify.irc-channel.${notifications.irc}.on-failed"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.osx/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.osx/artifacts/public/home.tar.xz"
scripts:
build: "taskcluster/host-build.sh"
package: "taskcluster/package.sh"
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/darwin-amd64-ctc-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build:
- "index.project.deepspeech.deepspeech.native_client.osx-ctc.${event.head.sha}"
- "notify.irc-channel.${notifications.irc}.on-exception"
- "notify.irc-channel.${notifications.irc}.on-failed"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.osx/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.osx/artifacts/public/home.tar.xz"
maxRunTime: 14400
scripts:
build: 'taskcluster/decoder-build.sh'
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/darwin-amd64-tflite-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build:
- "index.project.deepspeech.deepspeech.native_client.osx-tflite.${event.head.sha}"
- "notify.irc-channel.${notifications.irc}.on-exception"
- "notify.irc-channel.${notifications.irc}.on-failed"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.osx/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.osx/artifacts/public/home.tar.xz"
scripts:
build: "taskcluster/host-build.sh tflite"
package: "taskcluster/package.sh"
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/linux-amd64-cpu-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ build:
system_config:
>
${swig.patch_nodejs.linux}
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.cpu/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.cpu/artifacts/public/home.tar.xz"
scripts:
build: "taskcluster/host-build.sh"
package: "taskcluster/package.sh"
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/linux-amd64-ctc-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ build:
system_config:
>
${swig.patch_nodejs.linux}
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.cpu/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.cpu/artifacts/public/home.tar.xz"
scripts:
build: 'taskcluster/decoder-build.sh'
package: 'taskcluster/decoder-package.sh'
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/linux-amd64-gpu-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build:
system_config:
>
${swig.patch_nodejs.linux}
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.gpu/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.gpu/artifacts/public/home.tar.xz"
maxRunTime: 14400
scripts:
build: "taskcluster/cuda-build.sh"
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/linux-amd64-tflite-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ build:
system_config:
>
${swig.patch_nodejs.linux}
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.cpu/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.cpu/artifacts/public/home.tar.xz"
scripts:
build: "taskcluster/host-build.sh tflite"
package: "taskcluster/package.sh"
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/linux-arm64-cpu-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build:
- "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.arm64"
- "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.${event.head.sha}.arm64"
- "index.project.deepspeech.deepspeech.native_client.arm64.${event.head.sha}"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.arm64/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.arm64/artifacts/public/home.tar.xz"
## multistrap 2.2.0-ubuntu1 is broken in 14.04: https://bugs.launchpad.net/ubuntu/+source/multistrap/+bug/1313787
system_setup:
>
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/linux-rpi3-cpu-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build:
- "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.arm"
- "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.${event.head.sha}.arm"
- "index.project.deepspeech.deepspeech.native_client.arm.${event.head.sha}"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.arm/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.arm/artifacts/public/home.tar.xz"
## multistrap 2.2.0-ubuntu1 is broken in 14.04: https://bugs.launchpad.net/ubuntu/+source/multistrap/+bug/1313787
system_setup:
>
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/node-package-cpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build:
system_config:
>
${swig.patch_nodejs.linux}
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.cpu/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.cpu/artifacts/public/home.tar.xz"
scripts:
build: "taskcluster/node-build.sh"
package: "taskcluster/node-package.sh"
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/node-package-gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ build:
system_config:
>
${swig.patch_nodejs.linux}
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.cpu/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.cpu/artifacts/public/home.tar.xz"
scripts:
build: "taskcluster/node-build.sh --cuda"
package: "taskcluster/node-package.sh"
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/tc-brew-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ install_local_homebrew()
mkdir -p "${LOCAL_HOMEBREW_DIRECTORY}"
mkdir -p "${HOMEBREW_CACHE}"

curl -L https://github.com/Homebrew/brew/tarball/2.1.6 | tar xz --strip 1 -C "${LOCAL_HOMEBREW_DIRECTORY}"
curl -L https://github.com/Homebrew/brew/tarball/2.1.14 | tar xz --strip 1 -C "${LOCAL_HOMEBREW_DIRECTORY}"
export PATH=${LOCAL_HOMEBREW_DIRECTORY}/bin:$PATH

if [ ! -x "${LOCAL_HOMEBREW_DIRECTORY}/bin/brew" ]; then
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build:
- "test-training_upstream-linux-amd64-py35m-opt"
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-lite_benchmark_model-ds-tests.sh"
benchmark_model_bin: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.cpu/artifacts/public/lite_benchmark_model"
benchmark_model_bin: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.cpu/artifacts/public/lite_benchmark_model"
metadata:
name: "DeepSpeech Linux AMD64 CPU TF Lite benchmark_model"
description: "Testing DeepSpeech TF Lite benchmark_model for Linux/AMD64, CPU only, optimized version"
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build:
apt-get -qq -y install ${python.packages_trusty.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.5.5:m"
convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.cpu/artifacts/public/convert_graphdef_memmapped_format"
convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.cpu/artifacts/public/convert_graphdef_memmapped_format"
metadata:
name: "DeepSpeech Linux AMD64 CPU upstream training Py3.5"
description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 3.5, CPU only, optimized version"
2 changes: 1 addition & 1 deletion taskcluster/win-amd64-cpu-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build:
- "index.project.deepspeech.deepspeech.native_client.win.${event.head.sha}"
- "notify.irc-channel.${notifications.irc}.on-exception"
- "notify.irc-channel.${notifications.irc}.on-failed"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.win/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.win/artifacts/public/home.tar.xz"
scripts:
build: "taskcluster/win-build.sh"
package: "taskcluster/win-package.sh"
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/win-amd64-gpu-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build:
- "index.project.deepspeech.deepspeech.native_client.win-cuda.${event.head.sha}"
- "notify.irc-channel.${notifications.irc}.on-exception"
- "notify.irc-channel.${notifications.irc}.on-failed"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.win-cuda/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.win-cuda/artifacts/public/home.tar.xz"
scripts:
build: "taskcluster/win-build.sh --cuda"
package: "taskcluster/win-package.sh"
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/win-amd64-tflite-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build:
- "index.project.deepspeech.deepspeech.native_client.win-tflite.${event.head.sha}"
- "notify.irc-channel.${notifications.irc}.on-exception"
- "notify.irc-channel.${notifications.irc}.on-failed"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.win/artifacts/public/home.tar.xz"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.win/artifacts/public/home.tar.xz"
scripts:
build: "taskcluster/win-build.sh tflite"
package: "taskcluster/win-package.sh"
Expand Down

0 comments on commit 6eebdda

Please sign in to comment.