From 0b6be50479e6962db9e50f3251f5214397fc6e93 Mon Sep 17 00:00:00 2001 From: rgodden <7768980+goddenrich@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:45:36 +0000 Subject: [PATCH] find files outside of plz-out first --- tools/driver/packages/packages.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/driver/packages/packages.go b/tools/driver/packages/packages.go index 6f7522bd..899bf474 100644 --- a/tools/driver/packages/packages.go +++ b/tools/driver/packages/packages.go @@ -157,12 +157,12 @@ func packagesToResponse(rootpath string, pkgs []*packages.Package, dirs map[stri for i, file := range pkg.GoFiles { // This is pretty awkward; we need to try to figure out where these files exist now, // which isn't particularly clear to the build actions that generated them. - if path := filepath.Join(rootpath, "plz-out/subrepos", file); pathExists(path) { + if pathExists(file) { + pkg.GoFiles[i] = filepath.Join(rootpath, file) + } else if path := filepath.Join(rootpath, "plz-out/subrepos", file); pathExists(path) { pkg.GoFiles[i] = path } else if path := filepath.Join(rootpath, "plz-out/gen", file); pathExists(path) { pkg.GoFiles[i] = path - } else { - pkg.GoFiles[i] = filepath.Join(rootpath, file) } } pkg.CompiledGoFiles = pkg.GoFiles