darkkirb/gomod2nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

go: Apply package exclusion equally

Browse source 
The exclusion logic was moved out of getGoDirs but only buildPhase was updated
causing checkPhase to possibly fail. This happened in golint as it has go
files in testdata that are meant as testdata files and not go packages to
test which caused the checkPhase to fail.

This is a port of ddcc7c67d2
This commit is contained in:
adisbladis 2022-06-14 19:12:18 +08:00
parent df791b8057
commit 2028c2f3ff
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
builder/default.nix
View file

@ -298,7 +298,7 @@ let
if [ -n "$subPackages" ]; then if [ -n "$subPackages" ]; then
echo "$subPackages" | sed "s,\(^\| \),\1./,g" echo "$subPackages" | sed "s,\(^\| \),\1./,g"
else else
find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique find . -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort --unique | grep -v "$exclude"
fi fi
} }
@ -315,7 +315,6 @@ let
export NIX_BUILD_CORES=1 export NIX_BUILD_CORES=1
fi fi
for pkg in $(getGoDirs ""); do for pkg in $(getGoDirs ""); do
grep -q "$exclude" <<<$pkg && continue
echo "Building subPackage $pkg" echo "Building subPackage $pkg"
buildGoDir install "$pkg" buildGoDir install "$pkg"
done done