From 1a8adba02f7bc38979bb4ec67289f498b557835e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Tue, 11 Mar 2025 22:21:56 +0100 Subject: [PATCH] Branch for jazzy (#175) (cherry picked from commit ad756b1b398eca7c7ffffb8ce9a5b5f703dd08fa) --- .github/dependabot.yml | 7 +++ .github/mergify.yml | 52 +++++++++++++++++++ .../jazzy-binary-downstream-build.yml | 24 +++++++++ .github/workflows/jazzy-build.yml | 32 ++++++++++++ .github/workflows/jazzy-pre-commit.yml | 18 +++++++ .../rolling-binary-downstream-build.yml | 2 +- .github/workflows/rolling-build.yml | 2 +- .github/workflows/rolling-pre-commit.yml | 4 +- README.md | 4 +- 9 files changed, 139 insertions(+), 6 deletions(-) create mode 100644 .github/mergify.yml create mode 100644 .github/workflows/jazzy-binary-downstream-build.yml create mode 100644 .github/workflows/jazzy-build.yml create mode 100644 .github/workflows/jazzy-pre-commit.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f5e9921..a54004f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,6 +11,13 @@ updates: directory: "/" schedule: interval: "weekly" + - package-ecosystem: "github-actions" + # Workflow files stored in the + # default location of `.github/workflows` + directory: "/" + schedule: + interval: "weekly" + target-branch: "jazzy" - package-ecosystem: "github-actions" # Workflow files stored in the # default location of `.github/workflows` diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 0000000..9581f23 --- /dev/null +++ b/.github/mergify.yml @@ -0,0 +1,52 @@ +pull_request_rules: + + - name: Backport to humble at reviewers discretion + conditions: + - base=master + - "label=backport-humble" + actions: + backport: + branches: + - humble + + - name: Backport to jazzy at reviewers discretion + conditions: + - base=master + - "label=backport-jazzy" + actions: + backport: + branches: + - jazzy + + - name: Ask to resolve conflict + conditions: + - conflict + - author!=mergify[bot] + - author!=dependabot[bot] + actions: + comment: + message: This pull request is in conflict. Could you fix it @{{author}}? + + - name: Ask to resolve conflict for backports + conditions: + - conflict + - author=mergify[bot] + actions: + comment: + message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor? + + - name: development targets master branch + conditions: + - base!=master + - author!=bmagyar + - author!=destogl + - author!=christophfroehlich + - author!=saikishor + - author!=mergify[bot] + - author!=dependabot[bot] + actions: + comment: + message: | + @{{author}}, all pull requests must be targeted towards the `master` development branch. + Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master` + to have these changes reflected into new distributions. diff --git a/.github/workflows/jazzy-binary-downstream-build.yml b/.github/workflows/jazzy-binary-downstream-build.yml new file mode 100644 index 0000000..8ef2c95 --- /dev/null +++ b/.github/workflows/jazzy-binary-downstream-build.yml @@ -0,0 +1,24 @@ +name: Jazzy Downstream Build +# description: 'Build & test downstream packages from source.' +# author: Christoph Froehlich + +on: + workflow_dispatch: + pull_request: + branches: + - jazzy + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + build-downstream: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + with: + ros_distro: jazzy + ros_repo: testing + ref_for_scheduled_build: jazzy + not_test_build: true + downstream_workspace: ros_controls.jazzy.repos + not_test_downstream: true diff --git a/.github/workflows/jazzy-build.yml b/.github/workflows/jazzy-build.yml new file mode 100644 index 0000000..8d2eeba --- /dev/null +++ b/.github/workflows/jazzy-build.yml @@ -0,0 +1,32 @@ +name: Jazzy Binary Build +# author: Denis Štogl +# description: 'Build & test all dependencies from released (binary) packages.' + +on: + workflow_dispatch: + pull_request: + branches: + - jazzy + push: + branches: + - jazzy + schedule: + # Run every morning to detect flakiness and broken dependencies + - cron: '28 6 * * *' + +concurrency: + # cancel previous runs of the same workflow, except for pushes on jazzy branch + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }} + +jobs: + binary: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master + strategy: + fail-fast: false + matrix: + ROS_REPO: [main, testing] + with: + ros_distro: jazzy + ros_repo: ${{ matrix.ROS_REPO }} + ref_for_scheduled_build: jazzy diff --git a/.github/workflows/jazzy-pre-commit.yml b/.github/workflows/jazzy-pre-commit.yml new file mode 100644 index 0000000..02f64a7 --- /dev/null +++ b/.github/workflows/jazzy-pre-commit.yml @@ -0,0 +1,18 @@ +name: Jazzy Pre-Commit + +on: + workflow_dispatch: + pull_request: + branches: + - jazzy + +concurrency: + # cancel previous runs of the same workflow + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + pre-commit: + uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master + with: + ros_distro: jazzy diff --git a/.github/workflows/rolling-binary-downstream-build.yml b/.github/workflows/rolling-binary-downstream-build.yml index 29ab0ce..c251338 100644 --- a/.github/workflows/rolling-binary-downstream-build.yml +++ b/.github/workflows/rolling-binary-downstream-build.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [jazzy, rolling] + ROS_DISTRO: [rolling] ROS_REPO: [testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/.github/workflows/rolling-build.yml b/.github/workflows/rolling-build.yml index 375f5dd..3940317 100644 --- a/.github/workflows/rolling-build.yml +++ b/.github/workflows/rolling-build.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [jazzy, rolling] + ROS_DISTRO: [rolling] ROS_REPO: [main, testing] with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/.github/workflows/rolling-pre-commit.yml b/.github/workflows/rolling-pre-commit.yml index 437a97f..c590c1f 100644 --- a/.github/workflows/rolling-pre-commit.yml +++ b/.github/workflows/rolling-pre-commit.yml @@ -1,4 +1,4 @@ -name: Pre-Commit +name: Rolling Pre-Commit on: workflow_dispatch: @@ -17,6 +17,6 @@ jobs: strategy: fail-fast: false matrix: - ROS_DISTRO: [jazzy, rolling] + ROS_DISTRO: [rolling] with: ros_distro: ${{ matrix.ROS_DISTRO }} diff --git a/README.md b/README.md index 292cfb6..b6d5215 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ See [control_msgs documentation](https://index.ros.org/p/control_msgs/) on index |--------------|-----------------|--------------| | Noetic | [kinetic-devel](https://github.com/ros-controls/control_msgs/tree/kinetic-devel) | [Build status](https://travis-ci.org/ros-controls/control_msgs) | | Humble | [humble](https://github.com/ros-controls/control_msgs/tree/humble) | [![Humble Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/humble-build.yml/badge.svg)](https://github.com/ros-controls/control_msgs/actions/workflows/humble-build.yml) | -| Jazzy | [master](https://github.com/ros-controls/control_msgs/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml/badge.svg)](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml) | -| Rolling | [master](https://github.com/ros-controls/control_msgs/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml/badge.svg)](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml) | +| Jazzy | [jazzy](https://github.com/ros-controls/control_msgs/tree/jazzy) | [![Jazzy Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/jazzy-build.yml/badge.svg?branch=jazzy)](https://github.com/ros-controls/control_msgs/actions/workflows/jazzy-build.yml) | +| Rolling | [master](https://github.com/ros-controls/control_msgs/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml) | ## Code Formatting