Merge remote-tracking branch 'origin/master' into qhdwight/2024

umrover · Sep 21, 2023 · cad0d9f · cad0d9f
2 parents ab3b5e9 + 60d7a91
commit cad0d9f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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