From ead65483bee5b63c91cb9f82c9e43fc8f08ed44e Mon Sep 17 00:00:00 2001 From: Luke Schmitt Date: Wed, 17 Apr 2024 13:10:16 -0500 Subject: [PATCH 1/3] Remove melodic CI --- .github/workflows/xs-melodic.yaml | 34 ------------------------------- README.md | 1 - 2 files changed, 35 deletions(-) delete mode 100644 .github/workflows/xs-melodic.yaml diff --git a/.github/workflows/xs-melodic.yaml b/.github/workflows/xs-melodic.yaml deleted file mode 100644 index 4469f53..0000000 --- a/.github/workflows/xs-melodic.yaml +++ /dev/null @@ -1,34 +0,0 @@ -name: build-xs-melodic - -on: - push: - branches: - - main - - devel - pull_request: - branches: - - main - - devel - workflow_dispatch: - -defaults: - run: - shell: bash - -jobs: - xs-melodic: - strategy: - matrix: - env: - - {ROS_DISTRO: melodic, ROS_REPO: main, BUILDER: catkin_tools} - - {ROS_DISTRO: melodic, ROS_REPO: main, BUILDER: catkin_make} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Create src directory for xs - run: | - rm interbotix_ros_xseries/CATKIN_IGNORE - mkdir src - mv interbotix_ros_xseries src - - uses: 'ros-industrial/industrial_ci@master' - env: ${{matrix.env}} diff --git a/README.md b/README.md index 36a10ce..a6639bc 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ Support-level software can be found in the [interbotix_ros_toolboxes](https://gi | ROS Distro | X-Series ROS Core Build | | :------- | :------- | -| ROS 1 Melodic | [![build-xs-melodic](https://github.com/Interbotix/interbotix_ros_core/actions/workflows/xs-melodic.yaml/badge.svg)](https://github.com/Interbotix/interbotix_ros_core/actions/workflows/xs-melodic.yaml) | | ROS 1 Noetic | [![build-xs-noetic](https://github.com/Interbotix/interbotix_ros_core/actions/workflows/xs-noetic.yaml/badge.svg)](https://github.com/Interbotix/interbotix_ros_core/actions/workflows/xs-noetic.yaml) | | ROS 2 Galactic | [![build-xs-galactic](https://github.com/Interbotix/interbotix_ros_core/actions/workflows/xs-galactic.yaml/badge.svg)](https://github.com/Interbotix/interbotix_ros_core/actions/workflows/xs-galactic.yaml) | | ROS 2 Humble | [![build-xs-humble](https://github.com/Interbotix/interbotix_ros_core/actions/workflows/xs-humble.yaml/badge.svg)](https://github.com/Interbotix/interbotix_ros_core/actions/workflows/xs-humble.yaml) | From d0cb21a487b426d2a303062d149ed490e1e4fb9f Mon Sep 17 00:00:00 2001 From: Luke Schmitt Date: Wed, 17 Apr 2024 13:10:44 -0500 Subject: [PATCH 2/3] Only trigger xs, slate CI on updates to xs, slate --- .github/workflows/slate-noetic.yaml | 8 ++++++++ .github/workflows/xs-noetic.yaml | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/.github/workflows/slate-noetic.yaml b/.github/workflows/slate-noetic.yaml index 7df52a2..256d048 100644 --- a/.github/workflows/slate-noetic.yaml +++ b/.github/workflows/slate-noetic.yaml @@ -2,13 +2,21 @@ name: build-slate-noetic on: push: + paths-ignore: + - 'interbotix_ros_uxarms/**' + - 'interbotix_ros_xseries/**' branches: - main - devel + - noetic pull_request: + paths-ignore: + - 'interbotix_ros_uxarms/**' + - 'interbotix_ros_xseries/**' branches: - main - devel + - noetic workflow_dispatch: defaults: diff --git a/.github/workflows/xs-noetic.yaml b/.github/workflows/xs-noetic.yaml index b18add1..a936c7d 100644 --- a/.github/workflows/xs-noetic.yaml +++ b/.github/workflows/xs-noetic.yaml @@ -2,10 +2,16 @@ name: build-xs-noetic on: push: + paths-ignore: + - 'interbotix_ros_slate/**' + - 'interbotix_ros_uxarms/**' branches: - main - devel pull_request: + paths-ignore: + - 'interbotix_ros_slate/**' + - 'interbotix_ros_uxarms/**' branches: - main - devel From e2324a3f4bf8065dc036b97efb313fd562047a42 Mon Sep 17 00:00:00 2001 From: Luke Schmitt Date: Wed, 17 Apr 2024 13:14:49 -0500 Subject: [PATCH 3/3] Update noetic checkout to v4 --- .github/workflows/xs-noetic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/xs-noetic.yaml b/.github/workflows/xs-noetic.yaml index a936c7d..cd65aa1 100644 --- a/.github/workflows/xs-noetic.yaml +++ b/.github/workflows/xs-noetic.yaml @@ -30,7 +30,7 @@ jobs: - {ROS_DISTRO: noetic, ROS_REPO: main, BUILDER: catkin_make} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Create src directory for xs run: | rm interbotix_ros_xseries/CATKIN_IGNORE