Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update lockfile formating #2402

Merged
merged 7 commits into from
Jun 9, 2021
Merged

Update lockfile formating #2402

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e48bf1a
Use dpkg --list to format stdout to lockfile
ruffsl Jun 9, 2021
1c72a34
Line formating
ruffsl Jun 9, 2021
fa51d97
Specify ROS distro for rosdep update
ruffsl Jun 9, 2021
1bd83cc
Strip ros distro install fom AMENT_PREFIX_PATH
ruffsl Jun 9, 2021
a5f23e5
Prevent dpkg from listing all installed pacakge
ruffsl Jun 9, 2021
a00fc6e
Account single entry case AMENT_PREFIX_PATH
ruffsl Jun 9, 2021
8593459
Unset AMENT_PREFIX_PATH if only ros install path
ruffsl Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,20 @@ _commands:
working_directory: << parameters.workspace >>
command: |
. << parameters.underlay >>/install/setup.sh
AMENT_PREFIX_PATH=$(echo "$AMENT_PREFIX_PATH" | \
sed -e 's|:/opt/ros/'$ROS_DISTRO'$||')
if [ "$AMENT_PREFIX_PATH" == "/opt/ros/$ROS_DISTRO" ]
then
unset AMENT_PREFIX_PATH
fi

cat << parameters.underlay >>/lockfile.txt > lockfile.txt
vcs export --exact << parameters.underlay >>/src | \
(echo vcs_export && cat) >> lockfile.txt
sha256sum $PWD/lockfile.txt >> lockfile.txt
apt-get update
rosdep update

apt-get update
rosdep update --rosdistro $ROS_DISTRO
dependencies=$(
rosdep install -q -y \
--from-paths src \
Expand All @@ -99,7 +106,7 @@ _commands:
awk '$1 ~ /^resolution\:/' | \
awk -F'[][]' '{print $2}' | \
tr -d \, | xargs -n1 | sort -u | xargs)
dpkg -s $dependencies | \
dpkg --list dpkg $dependencies | \
(echo workspace_dependencies && cat) >> lockfile.txt
sha256sum $PWD/lockfile.txt >> lockfile.txt
setup_workspace:
Expand Down Expand Up @@ -287,12 +294,15 @@ _steps:
command: |
mkdir -p $ROS_WS/src && cd $ROS_WS
ln -s /opt/ros/$ROS_DISTRO install

echo $CACHE_NONCE | \
(echo cache_nonce && cat) >> lockfile.txt
sha256sum $PWD/lockfile.txt >> lockfile.txt

TZ=utc stat -c '%y' /ros_entrypoint.sh | \
(echo ros_entrypoint && cat) >> lockfile.txt
sha256sum $PWD/lockfile.txt >> lockfile.txt

rm -rf $OVERLAY_WS/*
on_checkout: &on_checkout
checkout:
Expand Down