Skip to content

Commit

Permalink
Exclude */.git/* files when finding packages.apt
Browse files Browse the repository at this point in the history
If a git branch name contains packages.apt, it can
break our jenkins script (see gazebosim/sdformat#392).

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
  • Loading branch information
scpeters committed Oct 17, 2020
1 parent c9a13ee commit 67d669e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion jenkins-scripts/docker/lib/docker_generate_dockerfile.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 67d669e

Please sign in to comment.