Skip to content

Updated Jazzy pipelines #44

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

Closed
wants to merge 2 commits into from
Closed
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
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ROS_DISTRO=rolling
ARG ROS_DISTRO=jazzy
FROM ros:$ROS_DISTRO-ros-base

ENV DEBIAN_FRONTEND=noninteractive
Expand Down
44 changes: 44 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
pull_request_rules:
- name: backport to iron at reviewers' discretion
conditions:
- base=main
- "label=backport-iron"
actions:
backport:
branches:
- iron

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

- name: backport to jazzy at reviewers' discretion
conditions:
- base=main
- "label=backport-jazzy"
actions:
backport:
branches:
- jazzy

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

- name: development targets main branch
conditions:
- base!=main
- author!=mergify[bot]
actions:
comment:
message: |
Please target the `main` branch for development, we will backport the changes to {{base}} for you if approved and if they don't break API.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Continuous Integration
on:
push:
branches:
- main
- jazzy
pull_request:
workflow_dispatch:

Expand All @@ -19,7 +19,7 @@ jobs:
fail-fast: false
matrix:
env:
- ROS_DISTRO: rolling
- ROS_DISTRO: jazzy
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ on:
pull_request:
push:
branches:
- main
- jazzy
workflow_dispatch:

jobs:
pre-commit:
name: Format
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"

- name: Install clang-format-14
run: sudo apt-get install clang-format-14
- name: Install clang-format-18
run: sudo apt-get install clang-format-18

- name: Run pre-commit
uses: pre-commit/action@v3.0.1
Expand Down