Replace setup step with docker image

Signed-off-by: Michael X. Grey <[email protected]>
open-rmf · Dec 11, 2023 · 22ab63f · 22ab63f
1 parent 3ad880a
commit 22ab63f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/asan.yaml b/.github/workflows/asan.yaml
@@ -8,13 +8,11 @@ jobs:
   asan:
     name: asan
     runs-on: ubuntu-22.04
+    container:
+      image: osrf/ros:iron-desktop-jammy
     steps:
       - name: create_blacklist
         run: echo "fun:*Eigen*" > /home/runner/work/blacklist.txt
-      - name: deps
-        uses: ros-tooling/[email protected]
-        with:
-          required-ros-distributions: iron
       - name: build_and_test
         uses: ros-tooling/[email protected]
         env:

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -17,19 +17,19 @@ jobs:
           - rolling
         include:
           # Humble Hawksbill (May 2022 - May 2027)
-          - docker_image: ubuntu:jammy
+          - ubuntu_distribution: jammy
             ros_distribution: humble
             ros_version: 2
           # Iron Irwini (May 2023 - November 2024)
-          - docker_image: ubuntu:jammy
+          - ubuntu_distribution: jammy
             ros_distribution: iron
             ros_version: 2
           # Rolling Ridley (No End-Of-Life)
-          - docker_image: ubuntu:jammy
+          - ubuntu_distribution: jammy
             ros_distribution: rolling
             ros_version: 2
     container:
-      image: ${{ matrix.docker_image }}
+      image: osrf/ros:${{ matrix.ros_distribution }}-desktop-${{ matrix.ubuntu_distribution }}
     steps:
       - name: pwd
         run: pwd

diff --git a/.github/workflows/tsan.yaml b/.github/workflows/tsan.yaml
@@ -8,11 +8,9 @@ jobs:
   tsan:
     name: tsan
     runs-on: ubuntu-22.04
+    container:
+      image: osrf/ros:iron-desktop-jammy
     steps:
-      - name: deps
-        uses: ros-tooling/[email protected]
-        with:
-          required-ros-distributions: iron
       - name: tsan_build_test
         uses: ros-tooling/[email protected]
         id: tsan_build_test