Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add branches for Jazzy and Humble with mergify support #62

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .github/.mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
---
pull_request_rules:
- name: backport to jazzy at reviewers discretion
conditions:
- base=main
- label=backport-jazzy
actions:
backport:
branches:
- jazzy

- name: backport to humble at reviewers discretion
conditions:
- base=main
- label=backport-humble
actions:
backport:
branches:
- humble

- name: delete head branch after merge
conditions:
- merged
actions:
delete_head_branch:

- name: ask to resolve conflict
conditions:
- conflict
- author!=mergify
actions:
comment:
message: This pull request is in conflict. Could you fix it @{{author}}?

# TODO enable automatic merge of backports
# https://docs.mergify.com/workflow/actions/backport/#combining-automatic-merge
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,21 @@ mkdir -p ~/ros2_ws/src

#### 2. Get the project source

By default, `ardupilot_gz` uses the `main` branch for ROS 2 `rolling` development.
We also maintain stable branches for LTS ROS distributions.
Be sure to check out the appropriate branch.

```bash
cd ~/ros2_ws

# For ROS 2 Rolling
vcs import --input https://raw.githubusercontent.com/ArduPilot/ardupilot_gz/main/ros2_gz.repos --recursive src

# For ROS 2 Jazzy
vcs import --input https://raw.githubusercontent.com/ArduPilot/ardupilot_gz/jazzy/ros2_gz.repos --recursive src

# For ROS 2 Humble
vcs import --input https://raw.githubusercontent.com/ArduPilot/ardupilot_gz/humble/ros2_gz.repos --recursive src
```

#### 3. Set the Gazebo version to Harmonic or Garden:
Expand Down Expand Up @@ -189,3 +201,8 @@ export SDF_PATH=$GZ_SIM_RESOURCE_PATH

This is assigned in the `iris.launch.py` file as `SDF_PATH` is not usually set
by the `ament` environment hooks.

## Contributing

`ardupilot_gz` uses the `main` branch for `rolling` development.
PR's must be targeted to that branch and can be backported to the stable branches.