Skip to content

Commit

Permalink
Merge branch 'develop' into humble
Browse files Browse the repository at this point in the history
  • Loading branch information
amock committed Jan 22, 2024
2 parents c848c2e + cf6db2c commit 51f7343
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 5 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/humble-ros.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: CI-humble
on:
push:
branches:
- 'humble'
pull_request:
branches:
- 'humble'
workflow_dispatch:
branches:
- '*'
jobs:
industrial_ci:
strategy:
matrix:
env:
- {ROS_DISTRO: humble, ROS_REPO: testing}
- {ROS_DISTRO: humble, ROS_REPO: main}
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- uses: 'ros-industrial/industrial_ci@master'
env: ${{matrix.env}}
17 changes: 12 additions & 5 deletions .github/workflows/main.yml → .github/workflows/master-ros.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
name: CI

on: [push, pull_request]

name: CI-master
on:
push:
branches:
- 'master'
pull_request:
branches:
- 'master'
workflow_dispatch:
branches:
- '*'
jobs:
industrial_ci:
strategy:
Expand All @@ -11,7 +18,7 @@ jobs:
- {ROS_DISTRO: melodic, ROS_REPO: main}
- {ROS_DISTRO: noetic, ROS_REPO: testing}
- {ROS_DISTRO: noetic, ROS_REPO: main}
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/melodic-ros.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: CI-melodic
on:
push:
branches:
- 'melodic'
pull_request:
branches:
- 'melodic'
workflow_dispatch:
branches:
- '*'
jobs:
industrial_ci:
strategy:
matrix:
env:
- {ROS_DISTRO: melodic, ROS_REPO: testing}
- {ROS_DISTRO: melodic, ROS_REPO: main}
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- uses: 'ros-industrial/industrial_ci@master'
env: ${{matrix.env}}
25 changes: 25 additions & 0 deletions .github/workflows/noetic-ros.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: CI-noetic
on:
push:
branches:
- 'noetic'
pull_request:
branches:
- 'noetic'
workflow_dispatch:
branches:
- '*'
jobs:
industrial_ci:
strategy:
matrix:
env:
- {ROS_DISTRO: noetic, ROS_REPO: testing}
- {ROS_DISTRO: noetic, ROS_REPO: main}
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- uses: 'ros-industrial/industrial_ci@master'
env: ${{matrix.env}}

0 comments on commit 51f7343

Please sign in to comment.