From 2d07a4d74d4c0ab2b40abfc5e08a1bae6b0a3dc0 Mon Sep 17 00:00:00 2001 From: Felix Exner Date: Mon, 28 Apr 2025 14:30:31 +0200 Subject: [PATCH 1/2] Name CI jobs and fix syntax --- .github/workflows/humble-binary-main.yml | 4 +--- .github/workflows/humble-binary-testing.yml | 4 +--- .github/workflows/humble-semi-binary-main.yml | 4 +--- .github/workflows/humble-semi-binary-testing.yml | 4 +--- .github/workflows/jazzy-binary-main.yml | 4 +--- .github/workflows/jazzy-binary-testing.yml | 4 +--- .github/workflows/jazzy-semi-binary-main.yml | 4 +--- .github/workflows/jazzy-semi-binary-testing.yml | 4 +--- .github/workflows/rolling-binary-main.yml | 4 +--- .github/workflows/rolling-binary-testing.yml | 4 +--- .github/workflows/rolling-semi-binary-main.yml | 4 +--- .github/workflows/rolling-semi-binary-testing.yml | 4 +--- 12 files changed, 12 insertions(+), 36 deletions(-) diff --git a/.github/workflows/humble-binary-main.yml b/.github/workflows/humble-binary-main.yml index a82498a..c5ddfe5 100644 --- a/.github/workflows/humble-binary-main.yml +++ b/.github/workflows/humble-binary-main.yml @@ -1,8 +1,6 @@ name: Humble Binary Main on: workflow_dispatch: - branches: - - humble pull_request: branches: - humble @@ -13,7 +11,7 @@ on: - cron: '13 4 * * *' jobs: - binary: + humble_binary_main: uses: ./.github/workflows/reusable_ici.yml with: ros_distro: humble diff --git a/.github/workflows/humble-binary-testing.yml b/.github/workflows/humble-binary-testing.yml index 9b13c39..269ebb6 100644 --- a/.github/workflows/humble-binary-testing.yml +++ b/.github/workflows/humble-binary-testing.yml @@ -1,8 +1,6 @@ name: Humble Binary Testing on: workflow_dispatch: - branches: - - humble pull_request: branches: - humble @@ -13,7 +11,7 @@ on: - cron: '13 4 * * *' jobs: - binary: + humble_binary_testing: uses: ./.github/workflows/reusable_ici.yml with: ros_distro: humble diff --git a/.github/workflows/humble-semi-binary-main.yml b/.github/workflows/humble-semi-binary-main.yml index a83d23f..bdd6440 100644 --- a/.github/workflows/humble-semi-binary-main.yml +++ b/.github/workflows/humble-semi-binary-main.yml @@ -1,8 +1,6 @@ name: Humble Semi Binary Main on: workflow_dispatch: - branches: - - humble pull_request: branches: - humble @@ -13,7 +11,7 @@ on: - cron: '13 4 * * *' jobs: - binary: + humble_semi_binary_main: uses: ./.github/workflows/reusable_ici.yml with: ros_distro: humble diff --git a/.github/workflows/humble-semi-binary-testing.yml b/.github/workflows/humble-semi-binary-testing.yml index 8a078f8..69ae50a 100644 --- a/.github/workflows/humble-semi-binary-testing.yml +++ b/.github/workflows/humble-semi-binary-testing.yml @@ -1,8 +1,6 @@ name: Humble Semi Binary Testing on: workflow_dispatch: - branches: - - humble pull_request: branches: - humble @@ -13,7 +11,7 @@ on: - cron: '13 4 * * *' jobs: - binary: + humble_semi_binary_testing: uses: ./.github/workflows/reusable_ici.yml with: ros_distro: humble diff --git a/.github/workflows/jazzy-binary-main.yml b/.github/workflows/jazzy-binary-main.yml index b9b9b6e..ea0a140 100644 --- a/.github/workflows/jazzy-binary-main.yml +++ b/.github/workflows/jazzy-binary-main.yml @@ -1,8 +1,6 @@ name: Jazzy Binary Main on: workflow_dispatch: - branches: - - ros2 pull_request: branches: - ros2 @@ -13,7 +11,7 @@ on: - cron: '13 4 * * *' jobs: - binary: + jazzy_binary_main: uses: ./.github/workflows/reusable_ici.yml with: ros_distro: jazzy diff --git a/.github/workflows/jazzy-binary-testing.yml b/.github/workflows/jazzy-binary-testing.yml index 276f784..8629a01 100644 --- a/.github/workflows/jazzy-binary-testing.yml +++ b/.github/workflows/jazzy-binary-testing.yml @@ -1,8 +1,6 @@ name: Jazzy Binary Testing on: workflow_dispatch: - branches: - - ros2 pull_request: branches: - ros2 @@ -13,7 +11,7 @@ on: - cron: '13 4 * * *' jobs: - binary: + jazzy_binary_testing: uses: ./.github/workflows/reusable_ici.yml with: ros_distro: jazzy diff --git a/.github/workflows/jazzy-semi-binary-main.yml b/.github/workflows/jazzy-semi-binary-main.yml index 0499aa2..d7d7243 100644 --- a/.github/workflows/jazzy-semi-binary-main.yml +++ b/.github/workflows/jazzy-semi-binary-main.yml @@ -1,8 +1,6 @@ name: Jazzy Semi Binary Main on: workflow_dispatch: - branches: - - ros2 pull_request: branches: - ros2 @@ -13,7 +11,7 @@ on: - cron: '13 4 * * *' jobs: - binary: + jazzy_semi_binary_main: uses: ./.github/workflows/reusable_ici.yml with: ros_distro: jazzy diff --git a/.github/workflows/jazzy-semi-binary-testing.yml b/.github/workflows/jazzy-semi-binary-testing.yml index 1fa4fa8..fbf8559 100644 --- a/.github/workflows/jazzy-semi-binary-testing.yml +++ b/.github/workflows/jazzy-semi-binary-testing.yml @@ -1,8 +1,6 @@ name: Jazzy Semi Binary Testing on: workflow_dispatch: - branches: - - ros2 pull_request: branches: - ros2 @@ -13,7 +11,7 @@ on: - cron: '13 4 * * *' jobs: - binary: + jazzy_semi_binary_testing: uses: ./.github/workflows/reusable_ici.yml with: ros_distro: jazzy diff --git a/.github/workflows/rolling-binary-main.yml b/.github/workflows/rolling-binary-main.yml index 8a573cb..a2a01a5 100644 --- a/.github/workflows/rolling-binary-main.yml +++ b/.github/workflows/rolling-binary-main.yml @@ -1,8 +1,6 @@ name: Rolling Binary Main on: workflow_dispatch: - branches: - - ros2 pull_request: branches: - ros2 @@ -13,7 +11,7 @@ on: - cron: '13 4 * * *' jobs: - binary: + rolling_binary_main: uses: ./.github/workflows/reusable_ici.yml with: ros_distro: rolling diff --git a/.github/workflows/rolling-binary-testing.yml b/.github/workflows/rolling-binary-testing.yml index 7582e10..191750b 100644 --- a/.github/workflows/rolling-binary-testing.yml +++ b/.github/workflows/rolling-binary-testing.yml @@ -1,8 +1,6 @@ name: Rolling Binary Testing on: workflow_dispatch: - branches: - - ros2 pull_request: branches: - ros2 @@ -13,7 +11,7 @@ on: - cron: '13 4 * * *' jobs: - binary: + rolling_binary_testing: uses: ./.github/workflows/reusable_ici.yml with: ros_distro: rolling diff --git a/.github/workflows/rolling-semi-binary-main.yml b/.github/workflows/rolling-semi-binary-main.yml index f569d97..5123654 100644 --- a/.github/workflows/rolling-semi-binary-main.yml +++ b/.github/workflows/rolling-semi-binary-main.yml @@ -1,8 +1,6 @@ name: Rolling Semi Binary Main on: workflow_dispatch: - branches: - - ros2 pull_request: branches: - ros2 @@ -13,7 +11,7 @@ on: - cron: '13 4 * * *' jobs: - binary: + rolling_semi_binary_main: uses: ./.github/workflows/reusable_ici.yml with: ros_distro: rolling diff --git a/.github/workflows/rolling-semi-binary-testing.yml b/.github/workflows/rolling-semi-binary-testing.yml index 739fed4..9d46181 100644 --- a/.github/workflows/rolling-semi-binary-testing.yml +++ b/.github/workflows/rolling-semi-binary-testing.yml @@ -1,8 +1,6 @@ name: Rolling Semi Binary Testing on: workflow_dispatch: - branches: - - ros2 pull_request: branches: - ros2 @@ -13,7 +11,7 @@ on: - cron: '13 4 * * *' jobs: - binary: + rolling_semi_binary_testing: uses: ./.github/workflows/reusable_ici.yml with: ros_distro: rolling From 71566fdba948cb347f7b86da90f071b7c30350b5 Mon Sep 17 00:00:00 2001 From: Felix Exner Date: Mon, 28 Apr 2025 14:30:59 +0200 Subject: [PATCH 2/2] Remove Iron CI things from repo --- .github/workflows/iron-binary-main.yml | 21 ---------------- .github/workflows/iron-binary-testing.yml | 21 ---------------- .github/workflows/iron-semi-binary-main.yml | 22 ---------------- .../workflows/iron-semi-binary-testing.yml | 22 ---------------- ur_simulation_gz.iron.repos | 25 ------------------- 5 files changed, 111 deletions(-) delete mode 100644 .github/workflows/iron-binary-main.yml delete mode 100644 .github/workflows/iron-binary-testing.yml delete mode 100644 .github/workflows/iron-semi-binary-main.yml delete mode 100644 .github/workflows/iron-semi-binary-testing.yml delete mode 100644 ur_simulation_gz.iron.repos diff --git a/.github/workflows/iron-binary-main.yml b/.github/workflows/iron-binary-main.yml deleted file mode 100644 index 40ddb61..0000000 --- a/.github/workflows/iron-binary-main.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Iron Binary Main -on: - workflow_dispatch: - branches: - - iron - pull_request: - branches: - - iron - push: - branches: - - iron - schedule: - - cron: '13 4 * * *' - -jobs: - binary: - uses: ./.github/workflows/reusable_ici.yml - with: - ros_distro: iron - ros_repo: main - ref_for_scheduled_build: iron diff --git a/.github/workflows/iron-binary-testing.yml b/.github/workflows/iron-binary-testing.yml deleted file mode 100644 index f790e51..0000000 --- a/.github/workflows/iron-binary-testing.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Iron Binary Testing -on: - workflow_dispatch: - branches: - - iron - pull_request: - branches: - - iron - push: - branches: - - iron - schedule: - - cron: '13 4 * * *' - -jobs: - binary: - uses: ./.github/workflows/reusable_ici.yml - with: - ros_distro: iron - ros_repo: testing - ref_for_scheduled_build: iron diff --git a/.github/workflows/iron-semi-binary-main.yml b/.github/workflows/iron-semi-binary-main.yml deleted file mode 100644 index c587f71..0000000 --- a/.github/workflows/iron-semi-binary-main.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Iron Semi Binary Main -on: - workflow_dispatch: - branches: - - iron - pull_request: - branches: - - iron - push: - branches: - - iron - schedule: - - cron: '13 4 * * *' - -jobs: - binary: - uses: ./.github/workflows/reusable_ici.yml - with: - ros_distro: iron - ros_repo: main - ref_for_scheduled_build: iron - upstream_workspace: ur_simulation_gz.iron.repos diff --git a/.github/workflows/iron-semi-binary-testing.yml b/.github/workflows/iron-semi-binary-testing.yml deleted file mode 100644 index 36429f6..0000000 --- a/.github/workflows/iron-semi-binary-testing.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Iron Semi Binary Testing -on: - workflow_dispatch: - branches: - - iron - pull_request: - branches: - - iron - push: - branches: - - iron - schedule: - - cron: '13 4 * * *' - -jobs: - binary: - uses: ./.github/workflows/reusable_ici.yml - with: - ros_distro: iron - ros_repo: testing - ref_for_scheduled_build: iron - upstream_workspace: ur_simulation_gz.iron.repos diff --git a/ur_simulation_gz.iron.repos b/ur_simulation_gz.iron.repos deleted file mode 100644 index fb71c86..0000000 --- a/ur_simulation_gz.iron.repos +++ /dev/null @@ -1,25 +0,0 @@ -repositories: - gz_ros2_control: - type: git - url: https://github.com/ros-controls/gz_ros2_control.git - version: iron - ros_gz: - type: git - url: https://github.com/gazebosim/ros_gz - version: iron - moveit2: - type: git - url: https://github.com/ros-planning/moveit2.git - version: iron - ros2_control: - type: git - url: https://github.com/ros-controls/ros2_control.git - version: iron - ros2_controllers: - type: git - url: https://github.com/ros-controls/ros2_controllers.git - version: iron - Universal_Robots_ROS2_Description: - type: git - url: https://github.com/UniversalRobots/Universal_Robots_ROS2_Description.git - version: iron