Merge remote-tracking branch 'origin/main' into switch-python-package…

…s-to-apt
CWRUbotix · Jul 6, 2024 · 3a33834 · 3a33834
2 parents e9f2365 + 95afaa3
commit 3a33834
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/.devcontainer/linux/devcontainer.json b/.devcontainer/linux/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name" : "ROV Linux",
-    "image": "ghcr.io/cwrurobotics/rov-25:iron",
+    "image": "ghcr.io/cwrubotix/rov-25:iron",
     "containerEnv": {
         "DISPLAY": "${localEnv:DISPLAY}"
     },

diff --git a/.devcontainer/macos/devcontainer.json b/.devcontainer/macos/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name" : "ROV macOS",
-    "image": "ghcr.io/cwrurobotics/rov-25:iron",
+    "image": "ghcr.io/cwrubotix/rov-25:iron",
     "containerEnv": {
         "DISPLAY": "unix:0"
     },

diff --git a/.devcontainer/windows/devcontainer.json b/.devcontainer/windows/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name" : "ROV Windows",
-    "image": "ghcr.io/cwrurobotics/rov-25:iron",
+    "image": "ghcr.io/cwrubotix/rov-25:iron",
     "containerEnv": {  
         "DISPLAY": "${localEnv:DISPLAY}"
     },

diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml
@@ -43,7 +43,7 @@ jobs:
         # Only pulls docker for iron since jazzy one is not built yet
         if: matrix.ROS_DISTRO == 'iron'
         env: # either pass all entries explicitly
-          DOCKER_IMAGE: ghcr.io/cwrurobotics/rov-25:${{matrix.ROS_DISTRO}}
+          DOCKER_IMAGE: ghcr.io/cwrubotix/rov-25:${{matrix.ROS_DISTRO}}
           ROS_DISTRO: ${{ matrix.ROS_DISTRO }}
           # Done to avoid permssion errors in the ros-industrial ci.
           DOCKER_RUN_OPTS: -u root
@@ -60,7 +60,7 @@ jobs:
       - uses: 'ros-industrial/industrial_ci@master' # run industrial_ci
         if: matrix.ROS_DISTRO != 'iron'
         env: # either pass all entries explicitly
-            # DOCKER_IMAGE: ghcr.io/cwrurobotics/rov-25:${{matrix.ROS_DISTRO}}
+            # DOCKER_IMAGE: ghcr.io/cwrubotix/rov-25:${{matrix.ROS_DISTRO}}
             ROS_DISTRO: ${{ matrix.ROS_DISTRO }}
             # Done to avoid permssion errors in the ros-industrial ci.
             # DOCKER_RUN_OPTS: -u root

diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "src/surface/ros2_video_streamer"]
 	path = src/surface/ros2_video_streamer
-	url = git@github.com:cwruRobotics/ros2_video_streamer.git
+	url = git@github.com:CWRUbotix/ros2_video_streamer.git
 [submodule "src/util/ament_pep257"]
 	path = src/util/ament_pep257
 	url = git@github.com:InvincibleRMC/ament_pep257.git
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -46,9 +46,9 @@
         {
             "label": "Docker Pull",
             "type": "shell",
-            "command": "sudo docker pull ghcr.io/cwrurobotics/rov-25:iron",
+            "command": "sudo docker pull ghcr.io/CWRUbotix/rov-25:iron",
             "windows": {
-                "command": "docker pull ghcr.io/cwrurobotics/rov-25:iron"
+                "command": "docker pull ghcr.io/CWRUbotix/rov-25:iron"
             },
             "hide": true
         },

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# MATE ROV 2023-24
+# MATE ROV 2024-25
 
-[![Continuous Integration](https://github.com/cwruRobotics/rov-25/actions/workflows/industrial_ci_action.yml/badge.svg)](https://github.com/cwruRobotics/rov-25/actions/workflows/industrial_ci_action.yml)
+[![Continuous Integration](https://github.com/CWRUbotix/rov-25/actions/workflows/industrial_ci_action.yml/badge.svg)](https://github.com/CWRUbotix/rov-25/actions/workflows/industrial_ci_action.yml)
 <a href=" https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" alt="Apache License"></a>
 
 # Table of Contents
@@ -24,7 +24,7 @@
 Start by opening up a terminal and navigating to where you want the code to be saved and entering the following command.
 
 ```bash
-git clone --recurse-submodules git@github.com:cwruRobotics/rov-25.git
+git clone --recurse-submodules git@github.com:CWRUbotix/rov-25.git
 ```
 
 If you've never contributed to a git repository before, you might receive an error message saying you don't have access. In that case visit [this tutorial](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/about-ssh) to set up SSH for local GitHub access.

diff --git a/src/surface/rov_gazebo/scripts/ardupilot_gazebo.sh b/src/surface/rov_gazebo/scripts/ardupilot_gazebo.sh
@@ -4,7 +4,7 @@ sudo apt-get update
 sudo apt-get install rapidjson-dev libignition-gazebo6-dev -y
 # Can't be ssh clone because that breaks docker.
 # Can either make a second file or just hope that our fork does not need lots of dev work
-git clone -b fortress  https://github.com/cwruRobotics/rov-ardupilot-gazebo-fortress.git ~/ardupilot_gazebo
+git clone -b fortress  https://github.com/CWRUbotix/rov-ardupilot-gazebo-fortress.git ~/ardupilot_gazebo
 cd ~/ardupilot_gazebo
 mkdir build && cd build
 cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo