Skip to content

Commit 5e50753

Browse files
committed
Add container environment build to CI after building image
* Add rosdep update call if that has not occurred yet in the current workspace. * Remove old TTY restriction from build script, use-case invalid.
1 parent bfe8c61 commit 5e50753

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.github/workflows/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ jobs:
3131
# Use scripting to perform a build for the current state of this branch.
3232
- name: Build image
3333
run: ./angel-docker-build.sh
34+
# Make sure workspace builds with this environment
35+
- name: Build Workspace
36+
run: ./angel-workspace-shell.sh -s workspace-shell-dev ./workspace_build.sh
3437

3538
code-style-py:
3639
runs-on: ubuntu-latest

docker/workspace_build.sh

-8
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@
1616
set -e
1717
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
1818

19-
# We expect this to only be run manually, thus if we're not in a TTY session
20-
if ! tty -s
21-
then
22-
echo "ERROR: Not running in a TTY. Are you sure you meant to run this?"
23-
exit 1
24-
fi
25-
26-
2719
# We don't want to auto apt update every single time, so only do it once on
2820
# first invocation of this script. The /tmp directory is not expected to be
2921
# mounted to the host filesystem, so it should be "fresh" every instantiation

docker/workspace_build_rosdep_install.sh

+6
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,10 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
77
# ROS2 workspace source directory.
88
cd "$SCRIPT_DIR"
99

10+
# Run update if we have no cache yet
11+
if [[ ! -d ${HOME}/.ros/rosdep ]]
12+
then
13+
rosdep update
14+
fi
15+
1016
rosdep install -i --from-path "${ANGEL_WORKSPACE_DIR}" --rosdistro "${ROS_DISTRO}" -y

0 commit comments

Comments
 (0)