Merge pull request #370 from lbr-stack/fix/lbr-fri-ros2-stack-369/ci

update CI/CD (#369)

Author: mhubii

.github/workflows/build-ubuntu-24.04-fri-1.11.yml

@@ -9,7 +9,6 @@ on:
 
 jobs:
   build:
-    uses: ./.github/workflows/build.yml
+    uses: ./.github/workflows/build-ubuntu-24.04.yml
     with:
-      os: ubuntu-24.04
       fri_version: 1.11

.github/workflows/build-ubuntu-24.04-fri-1.14.yml

@@ -9,7 +9,6 @@ on:
 
 jobs:
   build:
-    uses: ./.github/workflows/build.yml
+    uses: ./.github/workflows/build-ubuntu-24.04.yml
     with:
-      os: ubuntu-24.04
       fri_version: 1.14

.github/workflows/build-ubuntu-24.04-fri-1.15.yml

@@ -9,7 +9,6 @@ on:
 
 jobs:
   build:
-    uses: ./.github/workflows/build.yml
+    uses: ./.github/workflows/build-ubuntu-24.04.yml
     with:
-      os: ubuntu-24.04
       fri_version: 1.15

.github/workflows/build-ubuntu-24.04-fri-1.16.yml

@@ -9,7 +9,6 @@ on:
 
 jobs:
   build:
-    uses: ./.github/workflows/build.yml
+    uses: ./.github/workflows/build-ubuntu-24.04.yml
     with:
-      os: ubuntu-24.04
       fri_version: 1.16

.github/workflows/build-ubuntu-24.04-fri-2.5.yml

@@ -9,7 +9,6 @@ on:
 
 jobs:
   build:
-    uses: ./.github/workflows/build.yml
+    uses: ./.github/workflows/build-ubuntu-24.04.yml
     with:
-      os: ubuntu-24.04
       fri_version: 2.5

.github/workflows/build-ubuntu-24.04-fri-2.7.yml

@@ -9,7 +9,6 @@ on:
 
 jobs:
   build:
-    uses: ./.github/workflows/build.yml
+    uses: ./.github/workflows/build-ubuntu-24.04.yml
     with:
-      os: ubuntu-24.04
       fri_version: 2.7

.github/workflows/build.yml .github/workflows/build-ubuntu-24.04.yml.github/workflows/build.yml renamed to .github/workflows/build-ubuntu-24.04.yml

@@ -3,9 +3,6 @@ name: Build
 on:
   workflow_call: # https://github.com/orgs/community/discussions/52616#discussioncomment-9364532
     inputs:
-      os:
-        required: true
-        type: string
       fri_version:
         required: true
         type: string
@@ -14,9 +11,10 @@ on:
 # doc: https://ubuntu.com/blog/ros-2-ci-with-github-actions
 jobs:
   build:
-    runs-on: ${{ inputs.os }}
+    runs-on: ubuntu-24.04
+    container:
+      image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-desktop-latest
     steps:
-      - uses: ros-tooling/setup-ros@v0.7
       - uses: ros-tooling/action-ros-ci@v0.4
         with:
           package-name: lbr_fri_ros2_stack

README.md

@@ -58,7 +58,8 @@ Full documentation available on [Read the Docs](https://lbr-stack.readthedocs.io
     source /opt/ros/rolling/setup.bash
     export FRI_CLIENT_VERSION=1.15
     mkdir -p lbr-stack/src && cd lbr-stack
-    vcs import src --input https://raw.githubusercontent.com/lbr-stack/lbr_fri_ros2_stack/rolling/lbr_fri_ros2_stack/repos-fri-${FRI_CLIENT_VERSION}.yaml
+    git clone https://github.com/lbr-stack/lbr_fri_ros2_stack.git -b rolling src/lbr_fri_ros2_stack
+    vcs import src < src/lbr_fri_ros2_stack/lbr_fri_ros2_stack/repos-fri-${FRI_CLIENT_VERSION}.yaml
     rosdep install --from-paths src -i -r -y
     ```
 

lbr_fri_ros2_stack/repos-fri-1.11.yaml

@@ -7,7 +7,3 @@ repositories:
     type: git
     url: https://github.com/lbr-stack/lbr_fri_idl
     version: fri-1
-  lbr_fri_ros2_stack:
-    type: git
-    url: https://github.com/lbr-stack/lbr_fri_ros2_stack
-    version: rolling

lbr_fri_ros2_stack/repos-fri-1.14.yaml

@@ -7,7 +7,3 @@ repositories:
     type: git
     url: https://github.com/lbr-stack/lbr_fri_idl
     version: fri-1
-  lbr_fri_ros2_stack:
-    type: git
-    url: https://github.com/lbr-stack/lbr_fri_ros2_stack
-    version: rolling