From 840c4c00f7312bcba8c45dac12986a201a4655d8 Mon Sep 17 00:00:00 2001 From: Alvin Sun Date: Mon, 2 Oct 2023 20:07:16 -0700 Subject: [PATCH 1/4] add ROS2 iron build --- .github/workflows/humble.yml | 6 +++--- .github/workflows/iron.yml | 27 +++++++++++++++++++++++++++ .github/workflows/rolling.yml | 6 +++--- 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/iron.yml diff --git a/.github/workflows/humble.yml b/.github/workflows/humble.yml index 8a829e4..488c0d1 100644 --- a/.github/workflows/humble.yml +++ b/.github/workflows/humble.yml @@ -7,7 +7,7 @@ on: branches: [ "main" ] jobs: - build_docker: + build_humble: runs-on: ubuntu-latest container: image: ubuntu:jammy @@ -15,13 +15,13 @@ jobs: - name: cancle preivious run uses: styfle/cancel-workflow-action@0.11.0 - name: setup ROS2 - uses: ros-tooling/setup-ros@v0.5 + uses: ros-tooling/setup-ros@v0.7 with: required-ros-distributions: humble - name: Install dependencies run: pip install black - name: ROS2 build and test - uses: ros-tooling/action-ros-ci@v0.2 + uses: ros-tooling/action-ros-ci@v0.3.3 with: import-token: ${{ secrets.GITHUB_TOKEN }} target-ros2-distro: humble diff --git a/.github/workflows/iron.yml b/.github/workflows/iron.yml new file mode 100644 index 0000000..4c56373 --- /dev/null +++ b/.github/workflows/iron.yml @@ -0,0 +1,27 @@ +name: iron build + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build_iron: + runs-on: ubuntu-latest + container: + image: ubuntu:jammy + steps: + - name: cancle preivious run + uses: styfle/cancel-workflow-action@0.11.0 + - name: setup ROS2 + uses: ros-tooling/setup-ros@v0.7 + with: + required-ros-distributions: iron + - name: Install dependencies + run: pip install black + - name: ROS2 build and test + uses: ros-tooling/action-ros-ci@v0.3.3 + with: + import-token: ${{ secrets.GITHUB_TOKEN }} + target-ros2-distro: iron diff --git a/.github/workflows/rolling.yml b/.github/workflows/rolling.yml index eb31ab2..a90f656 100644 --- a/.github/workflows/rolling.yml +++ b/.github/workflows/rolling.yml @@ -7,7 +7,7 @@ on: branches: [ "main" ] jobs: - build_docker: + build_rolling: runs-on: ubuntu-latest container: image: ubuntu:jammy @@ -15,13 +15,13 @@ jobs: - name: cancle preivious run uses: styfle/cancel-workflow-action@0.11.0 - name: setup ROS2 - uses: ros-tooling/setup-ros@v0.5 + uses: ros-tooling/setup-ros@v0.7 with: required-ros-distributions: rolling - name: Install dependencies run: pip install black - name: ROS2 build and test - uses: ros-tooling/action-ros-ci@v0.2 + uses: ros-tooling/action-ros-ci@v0.3.3 with: import-token: ${{ secrets.GITHUB_TOKEN }} target-ros2-distro: rolling From 249cd3423fd608cbc62a296254cd1bdc0b32ee83 Mon Sep 17 00:00:00 2001 From: Alvin Sun Date: Mon, 2 Oct 2023 20:09:56 -0700 Subject: [PATCH 2/4] fix ros CI version --- .github/workflows/humble.yml | 2 +- .github/workflows/iron.yml | 2 +- .github/workflows/rolling.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/humble.yml b/.github/workflows/humble.yml index 488c0d1..d83cc25 100644 --- a/.github/workflows/humble.yml +++ b/.github/workflows/humble.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: pip install black - name: ROS2 build and test - uses: ros-tooling/action-ros-ci@v0.3.3 + uses: ros-tooling/action-ros-ci@v0.3 with: import-token: ${{ secrets.GITHUB_TOKEN }} target-ros2-distro: humble diff --git a/.github/workflows/iron.yml b/.github/workflows/iron.yml index 4c56373..3fe36aa 100644 --- a/.github/workflows/iron.yml +++ b/.github/workflows/iron.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: pip install black - name: ROS2 build and test - uses: ros-tooling/action-ros-ci@v0.3.3 + uses: ros-tooling/action-ros-ci@v0.3 with: import-token: ${{ secrets.GITHUB_TOKEN }} target-ros2-distro: iron diff --git a/.github/workflows/rolling.yml b/.github/workflows/rolling.yml index a90f656..9427e27 100644 --- a/.github/workflows/rolling.yml +++ b/.github/workflows/rolling.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: pip install black - name: ROS2 build and test - uses: ros-tooling/action-ros-ci@v0.3.3 + uses: ros-tooling/action-ros-ci@v0.3 with: import-token: ${{ secrets.GITHUB_TOKEN }} target-ros2-distro: rolling From 6a2906c91da3d5bf5b112a324b5b07cdd247af08 Mon Sep 17 00:00:00 2001 From: Alvin Sun Date: Mon, 2 Oct 2023 20:21:58 -0700 Subject: [PATCH 3/4] update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 01bdf65..1e57822 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # freeflyer2 ![humble build](https://github.com/StanfordASL/freeflyer2/actions/workflows/humble.yml/badge.svg?event=push) +![humble build](https://github.com/StanfordASL/freeflyer2/actions/workflows/iron.yml/badge.svg?event=push) ![rolling build](https://github.com/StanfordASL/freeflyer2/actions/workflows/rolling.yml/badge.svg?event=push) ASL FreeFlyer software stack with ROS2. See build status for support on ROS2 distrbutions. From 23b48c69f799ed32fc05f4c138a2960d8bdbcdfa Mon Sep 17 00:00:00 2001 From: Alvin Sun Date: Mon, 2 Oct 2023 20:23:33 -0700 Subject: [PATCH 4/4] fix typo in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e57822..e878eba 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # freeflyer2 ![humble build](https://github.com/StanfordASL/freeflyer2/actions/workflows/humble.yml/badge.svg?event=push) -![humble build](https://github.com/StanfordASL/freeflyer2/actions/workflows/iron.yml/badge.svg?event=push) +![iron build](https://github.com/StanfordASL/freeflyer2/actions/workflows/iron.yml/badge.svg?event=push) ![rolling build](https://github.com/StanfordASL/freeflyer2/actions/workflows/rolling.yml/badge.svg?event=push) ASL FreeFlyer software stack with ROS2. See build status for support on ROS2 distrbutions.