From d6d4b322df46e1423c13835f7d912a03b8ecb780 Mon Sep 17 00:00:00 2001 From: Ar-Ray-code Date: Mon, 12 Aug 2024 00:57:55 +0900 Subject: [PATCH 1/8] add ci --- .github/workflows/ci_jazzy.yml | 41 ++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .github/workflows/ci_jazzy.yml diff --git a/.github/workflows/ci_jazzy.yml b/.github/workflows/ci_jazzy.yml new file mode 100644 index 0000000..af506c2 --- /dev/null +++ b/.github/workflows/ci_jazzy.yml @@ -0,0 +1,41 @@ +name: ci_jazzy + +on: + push: + branches: + - "jazzy" + pull_request: + types: [opened, synchronize, labeled] + +jobs: + ci: + runs-on: ${{ matrix.os }} + if: | + ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING') && (github.base_ref == 'jazzy' )) || + ((github.event.action == 'synchronize') && (github.base_ref == 'jazzy') && contains(github.event.pull_request.labels.*.name, 'TESTING')) || + (github.ref_name == 'jazzy') + container: + image: osrf/ros:${{ matrix.ros_distribution }}-desktop + timeout-minutes: 20 + strategy: + fail-fast: false + matrix: + os: [ubuntu-24.04] + ros_distribution: [jazzy] + steps: + - uses: actions/checkout@v3 + - uses: ros-tooling/setup-ros@v0.7 + - name: Build and Test + uses: ros-tooling/action-ros-ci@v0.3 + with: + target-ros2-distro: ${{ matrix.ros_distribution }} + vcs-repo-file-url: | + repos/cyclonedds.repos + repos/ds.repos + repos/generate_parameter_library.repos + repos/micro_ros_agent.repos + repos/nmea.repos + repos/rqt_image_view.repos + repos/urg.repos + repos/velodyne.repos + repos/webcam.repos \ No newline at end of file From aaa9b5fc12c67d2fe68dadab9421c2ec7ae3a536 Mon Sep 17 00:00:00 2001 From: Ar-Ray-code Date: Mon, 12 Aug 2024 01:27:41 +0900 Subject: [PATCH 2/8] try to arm --- .github/workflows/ci_jazzy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_jazzy.yml b/.github/workflows/ci_jazzy.yml index af506c2..ac265d5 100644 --- a/.github/workflows/ci_jazzy.yml +++ b/.github/workflows/ci_jazzy.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-24.04] + os: [ubuntu-24.04-arm64] ros_distribution: [jazzy] steps: - uses: actions/checkout@v3 @@ -29,6 +29,7 @@ jobs: uses: ros-tooling/action-ros-ci@v0.3 with: target-ros2-distro: ${{ matrix.ros_distribution }} + skip-tests: true vcs-repo-file-url: | repos/cyclonedds.repos repos/ds.repos From 1c3314aeb32618e1749c08352659e541d1958f90 Mon Sep 17 00:00:00 2001 From: Ar-Ray-code Date: Mon, 12 Aug 2024 01:33:26 +0900 Subject: [PATCH 3/8] revert --- .github/workflows/ci_jazzy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_jazzy.yml b/.github/workflows/ci_jazzy.yml index ac265d5..9553f6b 100644 --- a/.github/workflows/ci_jazzy.yml +++ b/.github/workflows/ci_jazzy.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-24.04-arm64] + os: [ubuntu-24.04] ros_distribution: [jazzy] steps: - uses: actions/checkout@v3 From 407e7f23c895d3d0a4083bed88188d44a5c2df3e Mon Sep 17 00:00:00 2001 From: Ar-Ray-code Date: Mon, 12 Aug 2024 02:43:14 +0900 Subject: [PATCH 4/8] add iron test --- .github/workflows/ci_iron.yml | 41 ++++++++++++++++++++++++++++++++++ .github/workflows/ci_jazzy.yml | 5 ++--- 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/ci_iron.yml diff --git a/.github/workflows/ci_iron.yml b/.github/workflows/ci_iron.yml new file mode 100644 index 0000000..81178d0 --- /dev/null +++ b/.github/workflows/ci_iron.yml @@ -0,0 +1,41 @@ +name: ci_iron + +on: + push: + branches: + - "iron" + pull_request: + types: [opened, synchronize, labeled] + +jobs: + ci: + runs-on: ${{ matrix.os }} + if: | + ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING')) || + ((github.event.action == 'synchronize') && contains(github.event.pull_request.labels.*.name, 'TESTING')) + container: + image: osrf/ros:${{ matrix.ros_distribution }}-desktop + timeout-minutes: 20 + strategy: + fail-fast: false + matrix: + os: [ubuntu-24.04] + ros_distribution: [iron] + steps: + - uses: actions/checkout@v3 + - uses: ros-tooling/setup-ros@v0.7 + - name: Build and Test + uses: ros-tooling/action-ros-ci@v0.3 + with: + target-ros2-distro: ${{ matrix.ros_distribution }} + skip-tests: true + vcs-repo-file-url: | + repos/cyclonedds.repos + repos/ds.repos + repos/generate_parameter_library.repos + repos/micro_ros_agent.repos + repos/nmea.repos + repos/rqt_image_view.repos + repos/urg.repos + repos/velodyne.repos + repos/webcam.repos \ No newline at end of file diff --git a/.github/workflows/ci_jazzy.yml b/.github/workflows/ci_jazzy.yml index 9553f6b..1188059 100644 --- a/.github/workflows/ci_jazzy.yml +++ b/.github/workflows/ci_jazzy.yml @@ -11,9 +11,8 @@ jobs: ci: runs-on: ${{ matrix.os }} if: | - ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING') && (github.base_ref == 'jazzy' )) || - ((github.event.action == 'synchronize') && (github.base_ref == 'jazzy') && contains(github.event.pull_request.labels.*.name, 'TESTING')) || - (github.ref_name == 'jazzy') + ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING')) || + ((github.event.action == 'synchronize') && contains(github.event.pull_request.labels.*.name, 'TESTING')) container: image: osrf/ros:${{ matrix.ros_distribution }}-desktop timeout-minutes: 20 From e811d811e2262f9fc002be759b90e4c58169cfe1 Mon Sep 17 00:00:00 2001 From: Ar-Ray-code Date: Mon, 12 Aug 2024 02:53:17 +0900 Subject: [PATCH 5/8] fix os-distro --- .github/workflows/ci_iron.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_iron.yml b/.github/workflows/ci_iron.yml index 81178d0..2898c9a 100644 --- a/.github/workflows/ci_iron.yml +++ b/.github/workflows/ci_iron.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-24.04] + os: [ubuntu-22.04] ros_distribution: [iron] steps: - uses: actions/checkout@v3 From fc2020f9410001304847c63f02e908b9ede4e969 Mon Sep 17 00:00:00 2001 From: Ar-Ray <67567093+Ar-Ray-code@users.noreply.github.com> Date: Mon, 12 Aug 2024 04:44:44 +0900 Subject: [PATCH 6/8] update ci --- .github/workflows/ci_iron.yml | 4 +++- .github/workflows/ci_jazzy.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_iron.yml b/.github/workflows/ci_iron.yml index 2898c9a..9f23200 100644 --- a/.github/workflows/ci_iron.yml +++ b/.github/workflows/ci_iron.yml @@ -22,8 +22,10 @@ jobs: os: [ubuntu-22.04] ros_distribution: [iron] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ros-tooling/setup-ros@v0.7 + with: + required-ros-distributions: ${{ matrix.ros_distribution }} - name: Build and Test uses: ros-tooling/action-ros-ci@v0.3 with: diff --git a/.github/workflows/ci_jazzy.yml b/.github/workflows/ci_jazzy.yml index 1188059..e4288bf 100644 --- a/.github/workflows/ci_jazzy.yml +++ b/.github/workflows/ci_jazzy.yml @@ -22,8 +22,10 @@ jobs: os: [ubuntu-24.04] ros_distribution: [jazzy] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ros-tooling/setup-ros@v0.7 + with: + required-ros-distributions: ${{ matrix.ros_distribution }} - name: Build and Test uses: ros-tooling/action-ros-ci@v0.3 with: From 540ac163c6d287f2570056059e45f4cf462fd3ad Mon Sep 17 00:00:00 2001 From: Ar-Ray <67567093+Ar-Ray-code@users.noreply.github.com> Date: Mon, 12 Aug 2024 07:43:34 +0900 Subject: [PATCH 7/8] remove image_common pkg temporally --- .github/workflows/ci_iron.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci_iron.yml b/.github/workflows/ci_iron.yml index 9f23200..86ddaca 100644 --- a/.github/workflows/ci_iron.yml +++ b/.github/workflows/ci_iron.yml @@ -37,7 +37,5 @@ jobs: repos/generate_parameter_library.repos repos/micro_ros_agent.repos repos/nmea.repos - repos/rqt_image_view.repos repos/urg.repos repos/velodyne.repos - repos/webcam.repos \ No newline at end of file From 113eadf398ba95312518a74132f4380ae24082e2 Mon Sep 17 00:00:00 2001 From: Ar-Ray <67567093+Ar-Ray-code@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:07:50 +0900 Subject: [PATCH 8/8] fix ci --- .github/workflows/ci_iron.yml | 5 +++-- .github/workflows/ci_jazzy.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_iron.yml b/.github/workflows/ci_iron.yml index 86ddaca..ac61208 100644 --- a/.github/workflows/ci_iron.yml +++ b/.github/workflows/ci_iron.yml @@ -11,8 +11,9 @@ jobs: ci: runs-on: ${{ matrix.os }} if: | - ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING')) || - ((github.event.action == 'synchronize') && contains(github.event.pull_request.labels.*.name, 'TESTING')) + ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING') && (github.base_ref == 'iron' )) || + ((github.event.action == 'synchronize') && (github.base_ref == 'iron') && contains(github.event.pull_request.labels.*.name, 'TESTING')) || + (github.ref_name == 'iron') container: image: osrf/ros:${{ matrix.ros_distribution }}-desktop timeout-minutes: 20 diff --git a/.github/workflows/ci_jazzy.yml b/.github/workflows/ci_jazzy.yml index e4288bf..2e54293 100644 --- a/.github/workflows/ci_jazzy.yml +++ b/.github/workflows/ci_jazzy.yml @@ -11,8 +11,9 @@ jobs: ci: runs-on: ${{ matrix.os }} if: | - ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING')) || - ((github.event.action == 'synchronize') && contains(github.event.pull_request.labels.*.name, 'TESTING')) + ((github.event.action == 'labeled') && (github.event.label.name == 'TESTING') && (github.base_ref == 'jazzy' )) || + ((github.event.action == 'synchronize') && (github.base_ref == 'jazzy') && contains(github.event.pull_request.labels.*.name, 'TESTING')) || + (github.ref_name == 'jazzy') container: image: osrf/ros:${{ matrix.ros_distribution }}-desktop timeout-minutes: 20