Skip to content

Commit

Permalink
Merge branch 'master' into cleaning-jtc
Browse files Browse the repository at this point in the history
  • Loading branch information
bmagyar authored Feb 19, 2024
2 parents ca31d58 + 219a121 commit 8e577c4
Show file tree
Hide file tree
Showing 81 changed files with 221 additions and 557 deletions.
33 changes: 0 additions & 33 deletions .github/reviewer-lottery.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/ci-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
python-version: '3.10'
- name: Install system hooks
run: sudo apt install -qq clang-format-14 cppcheck
- uses: pre-commit/[email protected].0
- uses: pre-commit/[email protected].1
with:
extra_args: --all-files --hook-stage manual
24 changes: 0 additions & 24 deletions .github/workflows/humble-binary-build-testing.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Humble Binary Build - main
name: Humble Binary Build
# author: Denis Štogl <[email protected]>
# description: 'Build & test all dependencies from released (binary) packages.'

Expand All @@ -16,9 +16,13 @@ on:

jobs:
binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
strategy:
fail-fast: false
matrix:
ROS_REPO: [main, testing]
with:
ros_distro: humble
ros_repo: main
ros_repo: ${{ matrix.ROS_REPO }}
upstream_workspace: ros2_controllers-not-released.humble.repos
ref_for_scheduled_build: humble
2 changes: 1 addition & 1 deletion .github/workflows/humble-debian-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
humble_debian:
name: Humble debian build
uses: ./.github/workflows/reusable-debian-build.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
with:
ros_distro: humble
upstream_workspace: ros2_controllers.humble.repos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
humble_rhel_binary:
name: Humble RHEL binary build
uses: ./.github/workflows/reusable-rhel-binary-build.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
with:
ros_distro: humble
upstream_workspace: ros2_controllers.humble.repos
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/humble-semi-binary-build-testing.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Humble Semi-Binary Build - main
name: Humble Semi-Binary Build
# description: 'Build & test that compiles the main dependencies from source.'

on:
Expand All @@ -15,9 +15,13 @@ on:

jobs:
semi_binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
strategy:
fail-fast: false
matrix:
ROS_REPO: [main, testing]
with:
ros_distro: humble
ros_repo: main
ros_repo: ${{ matrix.ROS_REPO }}
upstream_workspace: ros2_controllers.humble.repos
ref_for_scheduled_build: humble
2 changes: 1 addition & 1 deletion .github/workflows/humble-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
source:
uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
with:
ros_distro: humble
ref: humble
Expand Down
26 changes: 0 additions & 26 deletions .github/workflows/iron-binary-build-testing.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Iron Binary Build - main
name: Iron Binary Build
# author: Denis Štogl <[email protected]>
# description: 'Build & test all dependencies from released (binary) packages.'

Expand All @@ -18,9 +18,13 @@ on:

jobs:
binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
strategy:
fail-fast: false
matrix:
ROS_REPO: [main, testing]
with:
ros_distro: iron
ros_repo: main
ros_repo: ${{ matrix.ROS_REPO }}
upstream_workspace: ros2_controllers-not-released.iron.repos
ref_for_scheduled_build: iron
2 changes: 1 addition & 1 deletion .github/workflows/iron-debian-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
iron_debian:
name: Iron debian build
uses: ./.github/workflows/reusable-debian-build.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
with:
ros_distro: iron
upstream_workspace: ros2_controllers.iron.repos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
iron_rhel_binary:
name: Iron RHEL binary build
uses: ./.github/workflows/reusable-rhel-binary-build.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
with:
ros_distro: iron
upstream_workspace: ros2_controllers.iron.repos
Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/iron-semi-binary-build-testing.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Iron Semi-Binary Build - main
name: Iron Semi-Binary Build
# description: 'Build & test that compiles the main dependencies from source.'

on:
Expand All @@ -17,9 +17,13 @@ on:

jobs:
semi_binary:
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
strategy:
fail-fast: false
matrix:
ROS_REPO: [main, testing]
with:
ros_distro: iron
ros_repo: main
ros_repo: ${{ matrix.ROS_REPO }}
upstream_workspace: ros2_controllers.iron.repos
ref_for_scheduled_build: iron
2 changes: 1 addition & 1 deletion .github/workflows/iron-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
source:
uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
with:
ros_distro: iron
ref: iron
Expand Down
63 changes: 0 additions & 63 deletions .github/workflows/reusable-debian-build.yml

This file was deleted.

Loading

0 comments on commit 8e577c4

Please sign in to comment.