From 97edf0af2a23719cfef7e888e7210989c09d101e Mon Sep 17 00:00:00 2001 From: Vincent Belpois Date: Mon, 18 Dec 2023 12:28:14 +0100 Subject: [PATCH 1/7] Changed color of one of the wheels --- src/ezbot_descr_simul/description/robot_core.xacro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ezbot_descr_simul/description/robot_core.xacro b/src/ezbot_descr_simul/description/robot_core.xacro index dd49e1c..60c72df 100644 --- a/src/ezbot_descr_simul/description/robot_core.xacro +++ b/src/ezbot_descr_simul/description/robot_core.xacro @@ -247,7 +247,7 @@ - Gazebo/White + Gazebo/Blue 1 0 0 1.0 From f51937198d7b1e3d8a9f1d95ffde9ff0d9039aa3 Mon Sep 17 00:00:00 2001 From: Vincent Belpois Date: Mon, 18 Dec 2023 12:34:16 +0100 Subject: [PATCH 2/7] Added workflow in ezBot branch --- .github/workflows/main.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..344cd1b --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,25 @@ +name: ROS 2 Workspace Action +# You may pin to the exact commit or the version. +# uses: ros/tooling-setup-actions/setup-ros@v1 +name: ROS 2 Workspace Build + +on: + push: + branches: + - ezBot-ROS_ws + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up ROS + uses: ros/tooling-setup-actions/setup-ros@v1 + with: + ros-distro: humble + + - name: Build workspace + run: colcon build From 40652dcd65f9cdf24f7989b945a991ace74d2e94 Mon Sep 17 00:00:00 2001 From: Vincent Belpois Date: Mon, 18 Dec 2023 12:35:20 +0100 Subject: [PATCH 3/7] Modified actions file --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 344cd1b..b00e04f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,6 @@ name: ROS 2 Workspace Action # You may pin to the exact commit or the version. # uses: ros/tooling-setup-actions/setup-ros@v1 -name: ROS 2 Workspace Build on: push: From 6776381fb2c1a3be2208bc5ea4b2a998d63598df Mon Sep 17 00:00:00 2001 From: ISAE-ENSMA Ensmasteel association <96253224+Ensmasteel@users.noreply.github.com> Date: Mon, 18 Dec 2023 11:37:19 +0100 Subject: [PATCH 4/7] Update main.yml --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b00e04f..8fb5c46 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,8 @@ on: jobs: build: runs-on: ubuntu-latest - + container: + image: ubuntu:jammy steps: - name: Checkout code uses: actions/checkout@v2 From dd6d8c093a3b54195d2f09ae150ee0828b41f91a Mon Sep 17 00:00:00 2001 From: ISAE-ENSMA Ensmasteel association <96253224+Ensmasteel@users.noreply.github.com> Date: Mon, 18 Dec 2023 11:38:43 +0100 Subject: [PATCH 5/7] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8fb5c46..d1ff233 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v2 - name: Set up ROS - uses: ros/tooling-setup-actions/setup-ros@v1 + uses: ros-tooling/setup-ros@v0.7 with: ros-distro: humble From 5ab1cc6bd214d9f1065dec57a2445e0f8a0d193d Mon Sep 17 00:00:00 2001 From: Vincent <46542431+VincidaB@users.noreply.github.com> Date: Mon, 18 Dec 2023 11:43:53 +0100 Subject: [PATCH 6/7] Update main.yml --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d1ff233..f72976e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,4 +22,7 @@ jobs: ros-distro: humble - name: Build workspace - run: colcon build + uses: ros-tooling/action-ros-ci@v0.2 + with: + package-name: ezBot + target-ros2-distro: humble From 373c306d8c1b4496723604ba9328db8834d41ac4 Mon Sep 17 00:00:00 2001 From: Vincent <46542431+VincidaB@users.noreply.github.com> Date: Mon, 18 Dec 2023 11:46:55 +0100 Subject: [PATCH 7/7] Update main.yml --- .github/workflows/main.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f72976e..a6777ed 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,4 @@ jobs: ros-distro: humble - name: Build workspace - uses: ros-tooling/action-ros-ci@v0.2 - with: - package-name: ezBot - target-ros2-distro: humble + run: source /opt/ros/humble/setup.bash & colcon build