From 5fa5aaf0fffd6593ca60ed974af3e87e29f3be28 Mon Sep 17 00:00:00 2001 From: "Adam Perry @ OpenAI" Date: Thu, 1 Oct 2026 17:08:21 +0000 Subject: [PATCH] Stabilize Windows voice build cache keys across tool reinstalls (#50046) ## Why Cygwin records installation timestamps in an unused Java truststore, changing Bazel action cache keys when the same tools are reinstalled. ## What changed Exclude `cygwin/etc/pki/ca-trust/extracted/java/cacerts` from the generated `cygwin` filegroup in `.github/scripts/voice_windows_tools.py`. GitOrigin-RevId: 8fdd910fadba7d977b45718546232652d073cdc8 --- .github/scripts/voice_windows_tools.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/scripts/voice_windows_tools.py b/.github/scripts/voice_windows_tools.py index 7dc26ee3fc..29000c16b3 100644 --- a/.github/scripts/voice_windows_tools.py +++ b/.github/scripts/voice_windows_tools.py @@ -48,7 +48,10 @@ def export_repository(root: Path, target: str, pkg_config: Path): raise ValueError("required Windows build tool missing") definitions = [ 'package(default_visibility = ["//visibility:public"])', - 'filegroup(name = "cygwin", srcs = glob(["cygwin/**"], allow_empty = False))', + # Cygwin records installation timestamps in this unused Java truststore. + # Exclude it so reinstalling the same tools preserves action cache keys. + 'filegroup(name = "cygwin", srcs = glob(["cygwin/**"], ' + 'exclude = ["cygwin/etc/pki/ca-trust/extracted/java/cacerts"], allow_empty = False))', 'filegroup(name = "pkgconf", srcs = glob(["pkgconf-image/**"], allow_empty = False))', 'filegroup(name = "tools", srcs = [":cygwin", ":pkgconf", "voice-tools.json"])', ]