Downgrade to Iron because I dont want to build ros-gz from source

Robotic-Decision-Making-Lab · Jan 9, 2024 · 946af08 · 946af08
1 parent 2ea1f94
commit 946af08
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/.devcontainer/nouveau/devcontainer.json b/.devcontainer/nouveau/devcontainer.json
@@ -40,13 +40,13 @@
         "autoDocstring.startOnNewLine": false,
         "autoDocstring.docstringFormat": "google-notypes",
         "python.autoComplete.extraPaths": [
-          "/opt/ros/rolling/lib/python3.10/site-packages/",
-          "/opt/ros/rolling/local/lib/python3.10/dist-packages/",
+          "/opt/ros/iron/lib/python3.10/site-packages/",
+          "/opt/ros/iron/local/lib/python3.10/dist-packages/",
           "${workspaceFolder}/install/"
         ],
         "python.analysis.extraPaths": [
-          "/opt/ros/rolling/lib/python3.10/site-packages/",
-          "/opt/ros/rolling/local/lib/python3.10/dist-packages/",
+          "/opt/ros/iron/lib/python3.10/site-packages/",
+          "/opt/ros/iron/local/lib/python3.10/dist-packages/",
           "${workspaceFolder}/install/"
         ],
         "C_Cpp.default.intelliSenseMode": "linux-gcc-x86",

diff --git a/.devcontainer/nvidia/devcontainer.json b/.devcontainer/nvidia/devcontainer.json
@@ -44,13 +44,13 @@
         "autoDocstring.startOnNewLine": false,
         "autoDocstring.docstringFormat": "google-notypes",
         "python.autoComplete.extraPaths": [
-          "/opt/ros/rolling/lib/python3.10/site-packages/",
-          "/opt/ros/rolling/local/lib/python3.10/dist-packages/",
+          "/opt/ros/iron/lib/python3.10/site-packages/",
+          "/opt/ros/iron/local/lib/python3.10/dist-packages/",
           "${workspaceFolder}/install/"
         ],
         "python.analysis.extraPaths": [
-          "/opt/ros/rolling/lib/python3.10/site-packages/",
-          "/opt/ros/rolling/local/lib/python3.10/dist-packages/",
+          "/opt/ros/iron/lib/python3.10/site-packages/",
+          "/opt/ros/iron/local/lib/python3.10/dist-packages/",
           "${workspaceFolder}/install/"
         ],
         "C_Cpp.default.intelliSenseMode": "linux-gcc-x86",

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG ROS_DISTRO=rolling
+ARG ROS_DISTRO=iron
 FROM ros:$ROS_DISTRO-ros-base as ci
 
 ENV DEBIAN_FRONTEND=noninteractive

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,8 +19,8 @@ jobs:
       fail-fast: false
       matrix:
         env:
-          - IMAGE: rolling-ci
-            ROS_DISTRO: rolling
+          - IMAGE: iron-ci
+            ROS_DISTRO: iron
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling]
+        ROS_DISTRO: [iron]
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -58,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling]
+        ROS_DISTRO: [iron]
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -98,7 +98,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling]
+        ROS_DISTRO: [iron]
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -138,7 +138,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ROS_DISTRO: [rolling]
+        ROS_DISTRO: [iron]
     runs-on: ubuntu-latest
     permissions:
       packages: write