From 67d669ef4df1305201dca1f870f8e2692fb1ee7c Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Fri, 16 Oct 2020 18:31:44 -0700 Subject: [PATCH] Exclude */.git/* files when finding packages.apt If a git branch name contains packages.apt, it can break our jenkins script (see osrf/sdformat#392). Signed-off-by: Steve Peters --- jenkins-scripts/docker/lib/docker_generate_dockerfile.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash b/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash index 9e1f8170d..9897a780e 100644 --- a/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash +++ b/jenkins-scripts/docker/lib/docker_generate_dockerfile.bash @@ -267,7 +267,7 @@ DELIM_DOCKER_WORKAROUND_SIMBODY fi # Install debian dependencies defined on the source code -SOURCE_DEFINED_DEPS="$(sort -u $(find . -iname 'packages-'$DISTRO'.apt' -o -iname 'packages.apt') | tr '\n' ' ')" +SOURCE_DEFINED_DEPS="$(sort -u $(find . -iname 'packages-'$DISTRO'.apt' -o -iname 'packages.apt' | grep -v '/\.git/') | tr '\n' ' ')" # Packages that will be installed and cached by docker. In a non-cache # run below, the docker script will check for the latest updates