Skip to content

Commit

Permalink
Use single branch for jazzy and rolling
Browse files Browse the repository at this point in the history
  • Loading branch information
bjsowa committed Nov 18, 2024
1 parent 16af7d5 commit 76c20ac
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ci-rolling.yml → .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
name: CI-Rolling
name: CI

on:
workflow_dispatch:
push:
branches:
- rolling
- ros2
pull_request:
branches:
- rolling

env:
ROS_DISTRO: rolling
- ros2

jobs:
industrial_ci:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [jazzy, rolling]
ROS_REPO: [testing, main]
env:
ROS_DISTRO: ${{ matrix.ROS_DISTRO }}
ROS_REPO: ${{ matrix.ROS_REPO }}
steps:
- name: Checkout repo
uses: actions/checkout@v1
uses: actions/checkout@v4
- name: Source tests
uses: "ros-industrial/industrial_ci@master"
env:
UPSTREAM_WORKSPACE: "github:LeoRover/leo_common-ros2#rolling"
UPSTREAM_WORKSPACE: "github:LeoRover/leo_common-ros2#${{ matrix.ROS_DISTRO }}"
PYLINT_CHECK: true
PYLINT_ARGS: "--rcfile=src/leo_robot-ros2/.pylintrc"

0 comments on commit 76c20ac

Please sign in to comment.