From d7241df2417689f521f53846ba2d2fc6249553e2 Mon Sep 17 00:00:00 2001 From: Reuben Morais Date: Sat, 22 Jun 2019 09:49:54 -0300 Subject: [PATCH] Update to Homebrew 2.1.6 --- taskcluster/.build.yml | 2 +- taskcluster/android-arm64-cpu-opt.yml | 2 +- taskcluster/android-armv7-cpu-opt.yml | 2 +- taskcluster/android-java-opt.yml | 2 +- taskcluster/android-x86_64-cpu-opt.yml | 2 +- taskcluster/darwin-amd64-cpu-opt.yml | 2 +- taskcluster/darwin-amd64-ctc-opt.yml | 2 +- taskcluster/linux-amd64-cpu-opt.yml | 2 +- taskcluster/linux-amd64-ctc-opt.yml | 2 +- taskcluster/linux-amd64-gpu-opt.yml | 2 +- taskcluster/linux-arm64-cpu-opt.yml | 2 +- taskcluster/linux-rpi3-cpu-opt.yml | 2 +- taskcluster/node-package-cpu.yml | 2 +- taskcluster/node-package-gpu.yml | 2 +- taskcluster/tc-brew-tests.sh | 2 +- taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml | 2 +- taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml | 2 +- taskcluster/win-amd64-cpu-opt.yml | 2 +- taskcluster/win-amd64-gpu-opt.yml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/taskcluster/.build.yml b/taskcluster/.build.yml index 28956eda..65c623c9 100644 --- a/taskcluster/.build.yml +++ b/taskcluster/.build.yml @@ -23,4 +23,4 @@ build: tests_cmdline: '' convert_graphdef: '' benchmark_model_bin: '' - tensorflow_git_desc: 'TensorFlow: v1.13.1-10-g3e0cc53' + tensorflow_git_desc: 'TensorFlow: v1.13.1-13-g174b476' diff --git a/taskcluster/android-arm64-cpu-opt.yml b/taskcluster/android-arm64-cpu-opt.yml index 6e556785..87df8041 100644 --- a/taskcluster/android-arm64-cpu-opt.yml +++ b/taskcluster/android-arm64-cpu-opt.yml @@ -12,7 +12,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.android-arm64/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.android-arm64/artifacts/public/home.tar.xz" scripts: build: "taskcluster/android-build.sh arm64-v8a" package: "taskcluster/android-package.sh arm64-v8a" diff --git a/taskcluster/android-armv7-cpu-opt.yml b/taskcluster/android-armv7-cpu-opt.yml index dd21900a..5793fba5 100644 --- a/taskcluster/android-armv7-cpu-opt.yml +++ b/taskcluster/android-armv7-cpu-opt.yml @@ -12,7 +12,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.android-armv7/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.android-armv7/artifacts/public/home.tar.xz" scripts: build: "taskcluster/android-build.sh armeabi-v7a" package: "taskcluster/android-package.sh armeabi-v7a" diff --git a/taskcluster/android-java-opt.yml b/taskcluster/android-java-opt.yml index 33156093..d25329ce 100644 --- a/taskcluster/android-java-opt.yml +++ b/taskcluster/android-java-opt.yml @@ -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.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.android-armv7/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.android-armv7/artifacts/public/home.tar.xz" scripts: build: "taskcluster/android-apk-build.sh" package: "taskcluster/android-apk-package.sh" diff --git a/taskcluster/android-x86_64-cpu-opt.yml b/taskcluster/android-x86_64-cpu-opt.yml index 55819cb7..1ae17b0d 100644 --- a/taskcluster/android-x86_64-cpu-opt.yml +++ b/taskcluster/android-x86_64-cpu-opt.yml @@ -12,7 +12,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.android-arm64/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.android-arm64/artifacts/public/home.tar.xz" scripts: build: "taskcluster/android-build.sh x86_64" package: "taskcluster/android-package.sh x86_64" diff --git a/taskcluster/darwin-amd64-cpu-opt.yml b/taskcluster/darwin-amd64-cpu-opt.yml index 4df82fa6..96fb4cca 100644 --- a/taskcluster/darwin-amd64-cpu-opt.yml +++ b/taskcluster/darwin-amd64-cpu-opt.yml @@ -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.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.osx/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.osx/artifacts/public/home.tar.xz" scripts: build: "taskcluster/host-build.sh" package: "taskcluster/package.sh" diff --git a/taskcluster/darwin-amd64-ctc-opt.yml b/taskcluster/darwin-amd64-ctc-opt.yml index 6d90641f..b922dd4c 100644 --- a/taskcluster/darwin-amd64-ctc-opt.yml +++ b/taskcluster/darwin-amd64-ctc-opt.yml @@ -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.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.osx/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.osx/artifacts/public/home.tar.xz" maxRunTime: 14400 scripts: build: 'taskcluster/decoder-build.sh' diff --git a/taskcluster/linux-amd64-cpu-opt.yml b/taskcluster/linux-amd64-cpu-opt.yml index e3e21404..c7d7ae60 100644 --- a/taskcluster/linux-amd64-cpu-opt.yml +++ b/taskcluster/linux-amd64-cpu-opt.yml @@ -14,7 +14,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.cpu/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.cpu/artifacts/public/home.tar.xz" scripts: build: "taskcluster/host-build.sh" package: "taskcluster/package.sh" diff --git a/taskcluster/linux-amd64-ctc-opt.yml b/taskcluster/linux-amd64-ctc-opt.yml index edfbf24a..fd3345ca 100644 --- a/taskcluster/linux-amd64-ctc-opt.yml +++ b/taskcluster/linux-amd64-ctc-opt.yml @@ -14,7 +14,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.cpu/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.cpu/artifacts/public/home.tar.xz" scripts: build: 'taskcluster/decoder-build.sh' package: 'taskcluster/decoder-package.sh' diff --git a/taskcluster/linux-amd64-gpu-opt.yml b/taskcluster/linux-amd64-gpu-opt.yml index 9c0973b9..7f3c0b1b 100644 --- a/taskcluster/linux-amd64-gpu-opt.yml +++ b/taskcluster/linux-amd64-gpu-opt.yml @@ -12,7 +12,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.gpu/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.gpu/artifacts/public/home.tar.xz" maxRunTime: 14400 scripts: build: "taskcluster/cuda-build.sh" diff --git a/taskcluster/linux-arm64-cpu-opt.yml b/taskcluster/linux-arm64-cpu-opt.yml index 25a578e6..9ae26813 100644 --- a/taskcluster/linux-arm64-cpu-opt.yml +++ b/taskcluster/linux-arm64-cpu-opt.yml @@ -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.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.arm64/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.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: > diff --git a/taskcluster/linux-rpi3-cpu-opt.yml b/taskcluster/linux-rpi3-cpu-opt.yml index e0aba7d3..e5f87a21 100644 --- a/taskcluster/linux-rpi3-cpu-opt.yml +++ b/taskcluster/linux-rpi3-cpu-opt.yml @@ -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.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.arm/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.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: > diff --git a/taskcluster/node-package-cpu.yml b/taskcluster/node-package-cpu.yml index fa58e2b2..d6f19329 100644 --- a/taskcluster/node-package-cpu.yml +++ b/taskcluster/node-package-cpu.yml @@ -17,7 +17,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.cpu/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.cpu/artifacts/public/home.tar.xz" scripts: build: "taskcluster/node-build.sh" package: "taskcluster/node-package.sh" diff --git a/taskcluster/node-package-gpu.yml b/taskcluster/node-package-gpu.yml index 4e661073..e6220f63 100644 --- a/taskcluster/node-package-gpu.yml +++ b/taskcluster/node-package-gpu.yml @@ -14,7 +14,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.cpu/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.cpu/artifacts/public/home.tar.xz" scripts: build: "taskcluster/node-build.sh --cuda" package: "taskcluster/node-package.sh" diff --git a/taskcluster/tc-brew-tests.sh b/taskcluster/tc-brew-tests.sh index 1a861da5..6665849f 100644 --- a/taskcluster/tc-brew-tests.sh +++ b/taskcluster/tc-brew-tests.sh @@ -37,7 +37,7 @@ install_local_homebrew() mkdir -p "${LOCAL_HOMEBREW_DIRECTORY}" mkdir -p "${HOMEBREW_CACHE}" - curl -L https://github.com/Homebrew/brew/tarball/1.8.0 | tar xz --strip 1 -C "${LOCAL_HOMEBREW_DIRECTORY}" + curl -L https://github.com/Homebrew/brew/tarball/2.1.6 | tar xz --strip 1 -C "${LOCAL_HOMEBREW_DIRECTORY}" export PATH=${LOCAL_HOMEBREW_DIRECTORY}/bin:$PATH if [ ! -x "${LOCAL_HOMEBREW_DIRECTORY}/bin/brew" ]; then diff --git a/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml b/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml index 1cd34d2e..d3068559 100644 --- a/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml +++ b/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml @@ -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.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.cpu/artifacts/public/lite_benchmark_model" + benchmark_model_bin: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.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" diff --git a/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml b/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml index b56d1ae9..c5f5ae2e 100644 --- a/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml +++ b/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml @@ -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.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.cpu/artifacts/public/convert_graphdef_memmapped_format" + convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.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" diff --git a/taskcluster/win-amd64-cpu-opt.yml b/taskcluster/win-amd64-cpu-opt.yml index e610b6a6..d0c00e2a 100644 --- a/taskcluster/win-amd64-cpu-opt.yml +++ b/taskcluster/win-amd64-cpu-opt.yml @@ -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.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.win/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.win/artifacts/public/home.tar.xz" scripts: build: "taskcluster/win-build.sh" package: "taskcluster/win-package.sh" diff --git a/taskcluster/win-amd64-gpu-opt.yml b/taskcluster/win-amd64-gpu-opt.yml index 9a3b6abf..4b0e6d19 100644 --- a/taskcluster/win-amd64-gpu-opt.yml +++ b/taskcluster/win-amd64-gpu-opt.yml @@ -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.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.win-cuda/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.174b4760eb1cba50482ed7d890e654060d360e4b.win-cuda/artifacts/public/home.tar.xz" scripts: build: "taskcluster/win-build.sh --cuda" package: "taskcluster/win-package.sh"