Use ABI workflow from ros2_control_ci (#2022)

(cherry picked from commit 82621a1) # Conflicts: # .github/workflows/humble-abi-compatibility.yml # .github/workflows/rolling-abi-compatibility.yml
ros-controls · Jan 29, 2025 · a2311aa · a2311aa
1 parent 4683eb8
commit a2311aa
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/humble-abi-compatibility.yml b/.github/workflows/humble-abi-compatibility.yml
@@ -21,6 +21,7 @@ concurrency:
 
 jobs:
   abi_check:
+<<<<<<< HEAD
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -30,3 +31,8 @@ jobs:
           ROS_REPO: main
           ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
           NOT_TEST_BUILD: true
+=======
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-abi-check.yml@master
+    with:
+      ros_distro: humble
+>>>>>>> 82621a1 (Use ABI workflow from ros2_control_ci (#2022))
diff --git a/.github/workflows/jazzy-abi-compatibility.yml b/.github/workflows/jazzy-abi-compatibility.yml
@@ -21,12 +21,6 @@ concurrency:
 
 jobs:
   abi_check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ros-industrial/industrial_ci@master
-        env:
-          ROS_DISTRO: jazzy
-          ROS_REPO: testing
-          ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
-          NOT_TEST_BUILD: true
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-abi-check.yml@master
+    with:
+      ros_distro: jazzy
diff --git a/.github/workflows/rolling-abi-compatibility.yml b/.github/workflows/rolling-abi-compatibility.yml
@@ -21,6 +21,7 @@ concurrency:
 
 jobs:
   abi_check:
+<<<<<<< HEAD
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -30,3 +31,8 @@ jobs:
           ROS_REPO: main
           ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
           NOT_TEST_BUILD: true
+=======
+    uses: ros-controls/ros2_control_ci/.github/workflows/reusable-abi-check.yml@master
+    with:
+      ros_distro: rolling
+>>>>>>> 82621a1 (Use ABI workflow from ros2_control_ci (#2022))