Skip to content

Commit

Permalink
Rework CI (#696)
Browse files Browse the repository at this point in the history
(cherry picked from commit 3379e73)

# Conflicts:
#	.github/workflows/nightly.yml
  • Loading branch information
pablogs9 authored and mergify[bot] committed Jun 3, 2024
1 parent 0b38b86 commit 7b9fd90
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 5 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
name: CI

on:
pull_request:
paths-ignore:
- 'README.md'
branches:
- '**'
workflow_call:
inputs:
ci_target_ref:
required: true
type: string

env:
ROS_DISTRO: humble
Expand All @@ -23,6 +22,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: src/micro_ros_setup
ref: ${{ inputs.ci_target_ref }}

- uses: ros-tooling/[email protected]
with:
Expand Down Expand Up @@ -63,6 +63,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: src/micro_ros_setup
ref: ${{ inputs.ci_target_ref }}

- uses: ros-tooling/[email protected]
with:
Expand Down Expand Up @@ -210,6 +211,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: src/micro_ros_setup
ref: ${{ inputs.ci_target_ref }}

- uses: ros-tooling/[email protected]
with:
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:

jobs:

<<<<<<< HEAD
micro_ros_build:
runs-on: ubuntu-latest
strategy:
Expand Down Expand Up @@ -632,3 +633,24 @@ jobs:
- name: installation
run: |
(test -f install/micro_ros_agent/lib/micro_ros_agent/micro_ros_agent) && true || false
=======
Jazzy:
uses: micro-ROS/micro_ros_setup/.github/workflows/ci.yml@jazzy
with:
ci_target_ref: 'jazzy'

Rolling:
uses: micro-ROS/micro_ros_setup/.github/workflows/ci.yml@rolling
with:
ci_target_ref: 'rolling'

Humble:
uses: micro-ROS/micro_ros_setup/.github/workflows/ci.yml@humble
with:
ci_target_ref: 'humble'

Iron:
uses: micro-ROS/micro_ros_setup/.github/workflows/ci.yml@iron
with:
ci_target_ref: 'iron'
>>>>>>> 3379e73 (Rework CI (#696))
15 changes: 15 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Pull Request CI

on:
pull_request:
paths-ignore:
- 'README.md'
branches:
- '**'

jobs:

CI:
uses: ./.github/workflows/ci.yml
with:
ci_target_ref: ${{ github.event.pull_request.head.ref }}

0 comments on commit 7b9fd90

Please sign in to comment.