From d89886a2a9bf0d618914ad3aef22ee57848005d2 Mon Sep 17 00:00:00 2001 From: Alex Tercete Date: Thu, 26 Jun 2025 11:48:23 +0100 Subject: [PATCH] test: fix failures related to submodules The `v0.9.3` tag of DeepSpeech contains submodules, which we don't seem to fully support when doing a checkout. Switching to an earlier tag (`v0.7.0`) fixes the failures. For some reason, this only happened on a clean run (in CI or locally without cache). We should investigate this further. --- e2e/MODULE.bazel | 8 ++++---- e2e/github-mozilla-deepspeech/BUILD.bazel | 4 ++-- e2e/github-mozilla-deepspeech/bzip2/BUILD.bazel | 4 ++-- e2e/github-mozilla-deepspeech/gzip/BUILD.bazel | 4 ++-- e2e/github-mozilla-deepspeech/tar/BUILD.bazel | 4 ++-- e2e/github-mozilla-deepspeech/xz/BUILD.bazel | 4 ++-- e2e/github-mozilla-deepspeech/zstd/BUILD.bazel | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/e2e/MODULE.bazel b/e2e/MODULE.bazel index 4728f64..67fe90c 100644 --- a/e2e/MODULE.bazel +++ b/e2e/MODULE.bazel @@ -32,14 +32,14 @@ fetch( ) fetch( - name = "github-mozilla-deepspeech-0.9.3", - reference = "refs/tags/v0.9.3", + name = "github-mozilla-deepspeech-0.7.0", + reference = "refs/tags/v0.7.0", remote = "https://github.com/mozilla/DeepSpeech.git", ) fetch( - name = "github-mozilla-deepspeech-f2e9c85880dff94115ab510cde9ca4af7ee51c19", - commit = "f2e9c85880dff94115ab510cde9ca4af7ee51c19", + name = "github-mozilla-deepspeech-3fbbca2b55e73adecf9a8b93b7ea82b8a08e640e", + commit = "3fbbca2b55e73adecf9a8b93b7ea82b8a08e640e", remote = "https://github.com/mozilla/DeepSpeech.git", ) diff --git a/e2e/github-mozilla-deepspeech/BUILD.bazel b/e2e/github-mozilla-deepspeech/BUILD.bazel index 8b7093a..bd17060 100644 --- a/e2e/github-mozilla-deepspeech/BUILD.bazel +++ b/e2e/github-mozilla-deepspeech/BUILD.bazel @@ -3,6 +3,6 @@ load("@rules_diff//diff/directory/test:defs.bzl", "diff_directory_test") diff_directory_test( name = "checkout", size = "small", - a = "@github-mozilla-deepspeech-0.9.3//:checkout", - b = "@github-mozilla-deepspeech-f2e9c85880dff94115ab510cde9ca4af7ee51c19//:checkout", + a = "@github-mozilla-deepspeech-0.7.0//:checkout", + b = "@github-mozilla-deepspeech-3fbbca2b55e73adecf9a8b93b7ea82b8a08e640e//:checkout", ) diff --git a/e2e/github-mozilla-deepspeech/bzip2/BUILD.bazel b/e2e/github-mozilla-deepspeech/bzip2/BUILD.bazel index 4776510..7bd8423 100644 --- a/e2e/github-mozilla-deepspeech/bzip2/BUILD.bazel +++ b/e2e/github-mozilla-deepspeech/bzip2/BUILD.bazel @@ -3,12 +3,12 @@ load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack") tar_unpack( name = "unpacked", - src = "@github-mozilla-deepspeech-f2e9c85880dff94115ab510cde9ca4af7ee51c19//:archive.tar.bz2", + src = "@github-mozilla-deepspeech-3fbbca2b55e73adecf9a8b93b7ea82b8a08e640e//:archive.tar.bz2", ) diff_directory_test( name = "checkout", size = "small", a = ":unpacked", - b = "@github-mozilla-deepspeech-f2e9c85880dff94115ab510cde9ca4af7ee51c19//:checkout", + b = "@github-mozilla-deepspeech-3fbbca2b55e73adecf9a8b93b7ea82b8a08e640e//:checkout", ) diff --git a/e2e/github-mozilla-deepspeech/gzip/BUILD.bazel b/e2e/github-mozilla-deepspeech/gzip/BUILD.bazel index b6d5432..02cc358 100644 --- a/e2e/github-mozilla-deepspeech/gzip/BUILD.bazel +++ b/e2e/github-mozilla-deepspeech/gzip/BUILD.bazel @@ -3,12 +3,12 @@ load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack") tar_unpack( name = "unpacked", - src = "@github-mozilla-deepspeech-f2e9c85880dff94115ab510cde9ca4af7ee51c19//:archive.tar.gz", + src = "@github-mozilla-deepspeech-3fbbca2b55e73adecf9a8b93b7ea82b8a08e640e//:archive.tar.gz", ) diff_directory_test( name = "checkout", size = "small", a = ":unpacked", - b = "@github-mozilla-deepspeech-f2e9c85880dff94115ab510cde9ca4af7ee51c19//:checkout", + b = "@github-mozilla-deepspeech-3fbbca2b55e73adecf9a8b93b7ea82b8a08e640e//:checkout", ) diff --git a/e2e/github-mozilla-deepspeech/tar/BUILD.bazel b/e2e/github-mozilla-deepspeech/tar/BUILD.bazel index 2031ac1..19b98ee 100644 --- a/e2e/github-mozilla-deepspeech/tar/BUILD.bazel +++ b/e2e/github-mozilla-deepspeech/tar/BUILD.bazel @@ -3,12 +3,12 @@ load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack") tar_unpack( name = "unpacked", - src = "@github-mozilla-deepspeech-f2e9c85880dff94115ab510cde9ca4af7ee51c19//:archive.tar", + src = "@github-mozilla-deepspeech-3fbbca2b55e73adecf9a8b93b7ea82b8a08e640e//:archive.tar", ) diff_directory_test( name = "checkout", size = "small", a = ":unpacked", - b = "@github-mozilla-deepspeech-f2e9c85880dff94115ab510cde9ca4af7ee51c19//:checkout", + b = "@github-mozilla-deepspeech-3fbbca2b55e73adecf9a8b93b7ea82b8a08e640e//:checkout", ) diff --git a/e2e/github-mozilla-deepspeech/xz/BUILD.bazel b/e2e/github-mozilla-deepspeech/xz/BUILD.bazel index 8e84fde..8cecc3b 100644 --- a/e2e/github-mozilla-deepspeech/xz/BUILD.bazel +++ b/e2e/github-mozilla-deepspeech/xz/BUILD.bazel @@ -3,12 +3,12 @@ load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack") tar_unpack( name = "unpacked", - src = "@github-mozilla-deepspeech-f2e9c85880dff94115ab510cde9ca4af7ee51c19//:archive.tar.xz", + src = "@github-mozilla-deepspeech-3fbbca2b55e73adecf9a8b93b7ea82b8a08e640e//:archive.tar.xz", ) diff_directory_test( name = "checkout", size = "small", a = ":unpacked", - b = "@github-mozilla-deepspeech-f2e9c85880dff94115ab510cde9ca4af7ee51c19//:checkout", + b = "@github-mozilla-deepspeech-3fbbca2b55e73adecf9a8b93b7ea82b8a08e640e//:checkout", ) diff --git a/e2e/github-mozilla-deepspeech/zstd/BUILD.bazel b/e2e/github-mozilla-deepspeech/zstd/BUILD.bazel index b365dc0..112b8ed 100644 --- a/e2e/github-mozilla-deepspeech/zstd/BUILD.bazel +++ b/e2e/github-mozilla-deepspeech/zstd/BUILD.bazel @@ -3,14 +3,14 @@ load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack") tar_unpack( name = "unpacked", - src = "@github-mozilla-deepspeech-f2e9c85880dff94115ab510cde9ca4af7ee51c19//:archive.tar.zst", + src = "@github-mozilla-deepspeech-3fbbca2b55e73adecf9a8b93b7ea82b8a08e640e//:archive.tar.zst", ) diff_directory_test( name = "checkout", size = "small", a = ":unpacked", - b = "@github-mozilla-deepspeech-f2e9c85880dff94115ab510cde9ca4af7ee51c19//:checkout", + b = "@github-mozilla-deepspeech-3fbbca2b55e73adecf9a8b93b7ea82b8a08e640e//:checkout", # FIXME: `@ape//:zstd` currently closes `stdin` on large inputs # Possibly an issue in Cosmopolitan `libc`, a new release may fix tags = ["manual"], -- GitLab