Skip to content

Commit

Permalink
Merge branch 'humble' into mergify/bp/humble/pr-957
Browse files Browse the repository at this point in the history
  • Loading branch information
christophfroehlich committed Feb 18, 2024
2 parents 15ef581 + 6c1fe34 commit 9492e13
Show file tree
Hide file tree
Showing 106 changed files with 629 additions and 520 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-coverage-build-humble.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
required-ros-distributions: ${{ env.ROS_DISTRO }}
- uses: actions/checkout@v4
- uses: ros-tooling/[email protected].5
- uses: ros-tooling/[email protected].6
with:
target-ros2-distro: ${{ env.ROS_DISTRO }}
import-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
}
}
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
- uses: codecov/codecov-action@v3.1.4
- uses: codecov/codecov-action@v4.0.1
with:
file: ros_ws/lcov/total_coverage.info
flags: unittests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
required-ros-distributions: ${{ env.ROS_DISTRO }}
- uses: actions/checkout@v4
- uses: ros-tooling/[email protected].5
- uses: ros-tooling/[email protected].6
with:
target-ros2-distro: ${{ env.ROS_DISTRO }}
import-token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -37,7 +37,7 @@ jobs:
}
}
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
- uses: codecov/codecov-action@v3.1.4
- uses: codecov/codecov-action@v4.0.1
with:
file: ros_ws/lcov/total_coverage.info
flags: unittests
Expand Down
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
20 changes: 0 additions & 20 deletions .github/workflows/foxy-abi-compatibility.yml

This file was deleted.

26 changes: 0 additions & 26 deletions .github/workflows/foxy-binary-build-main.yml

This file was deleted.

26 changes: 0 additions & 26 deletions .github/workflows/foxy-binary-build-testing.yml

This file was deleted.

25 changes: 0 additions & 25 deletions .github/workflows/foxy-semi-binary-build-main.yml

This file was deleted.

25 changes: 0 additions & 25 deletions .github/workflows/foxy-semi-binary-build-testing.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/galactic-abi-compatibility.yml

This file was deleted.

26 changes: 0 additions & 26 deletions .github/workflows/galactic-binary-build-main.yml

This file was deleted.

26 changes: 0 additions & 26 deletions .github/workflows/galactic-binary-build-testing.yml

This file was deleted.

33 changes: 0 additions & 33 deletions .github/workflows/galactic-rhel-binary-build.yml

This file was deleted.

25 changes: 0 additions & 25 deletions .github/workflows/galactic-semi-binary-build-main.yml

This file was deleted.

25 changes: 0 additions & 25 deletions .github/workflows/galactic-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 Binary Build - main
name: Humble Binary Build
# author: Denis Štogl <[email protected]>
# description: 'Build & test all dependencies from released (binary) packages.'

Expand All @@ -18,9 +18,12 @@ 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:
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
20 changes: 20 additions & 0 deletions .github/workflows/humble-debian-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Debian Humble Build
on:
workflow_dispatch:
pull_request:
branches:
- humble
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 1 * * *'


jobs:
humble_debian:
name: Humble debian build
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
with:
ros_distro: humble
upstream_workspace: ros2_controllers.humble.repos
ref_for_scheduled_build: humble
skip_packages: rqt_joint_trajectory_controller
Loading

0 comments on commit 9492e13

Please sign in to comment.