From 60d7a91756a2b3e6476356e324850ed3f27e4e61 Mon Sep 17 00:00:00 2001 From: qhdwight Date: Thu, 21 Sep 2023 01:31:11 -0400 Subject: [PATCH] Fixup minor bug that was blocking CI --- .github/workflows/ci.yml | 2 ++ src/navigation/navigation.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8585ce5d..53cadecc9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,8 @@ jobs: runs-on: ubuntu-latest container: image: umrover1/ros:latest + # GitHub is silly and requires us to be running as root for their checkout action + # Our docker container exports the user mrover, so we have to specific this explicitly options: --user root steps: - uses: actions/checkout@v4 diff --git a/src/navigation/navigation.py b/src/navigation/navigation.py index 4a3c82279..2416c605a 100755 --- a/src/navigation/navigation.py +++ b/src/navigation/navigation.py @@ -7,7 +7,6 @@ import rospy import smach import smach_ros -from navigation.state import DoneState, DoneStateTransitions, OffState, OffStateTransitions from smach.log import loginfo from smach.log import set_loggers from std_msgs.msg import String @@ -19,6 +18,7 @@ from post_backup import PostBackupState, PostBackupTransitions from recovery import RecoveryState, RecoveryStateTransitions from search import SearchState, SearchStateTransitions +from state import DoneState, DoneStateTransitions, OffState, OffStateTransitions from waypoint import WaypointState, WaypointStateTransitions