Skip to content

Commit

Permalink
Merge branch 'main' into pr-add-params-for-velocity-force
Browse files Browse the repository at this point in the history
  • Loading branch information
pac48 authored Feb 15, 2024
2 parents 70167a2 + 480fe39 commit 79d0303
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
env:
ROS_DISTRO: rolling
steps:
- uses: ros-tooling/setup-ros@0.6.2
- uses: ros-tooling/setup-ros@v0.7
with:
required-ros-distributions: ${{ env.ROS_DISTRO }}
- uses: actions/checkout@v3
- uses: ros-tooling/action-ros-ci@0.3.2
- uses: actions/checkout@v4
- uses: ros-tooling/action-ros-ci@v0.3
with:
target-ros2-distro: ${{ env.ROS_DISTRO }}
import-token: ${{ secrets.GITHUB_TOKEN }}
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 @@ -15,7 +15,7 @@ jobs:
name: Format
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/[email protected]
with:
python-version: "3.10"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-ros-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
matrix:
linter: [copyright, lint_cmake]
steps:
- uses: actions/checkout@v3
- uses: ros-tooling/setup-ros@0.6.2
- uses: actions/checkout@v4
- uses: ros-tooling/setup-ros@v0.7
- uses: ros-tooling/[email protected]
with:
distribution: rolling
Expand All @@ -29,8 +29,8 @@ jobs:
matrix:
linter: [cpplint]
steps:
- uses: actions/checkout@v3
- uses: ros-tooling/setup-ros@0.6.2
- uses: actions/checkout@v4
- uses: ros-tooling/setup-ros@v0.7
- uses: ros-tooling/[email protected]
with:
distribution: rolling
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prerelease-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
pre_release:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.branch }}
- name: industrial_ci
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable-industrial-ci-with-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ jobs:
steps:
- name: Checkout ${{ inputs.ref }} when build is not scheduled
if: ${{ github.event_name != 'schedule' }}
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Checkout ${{ inputs.ref }} on scheduled build
if: ${{ github.event_name == 'schedule' }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref_for_scheduled_build }}
- name: cache target_ws
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/reusable-ros-tooling-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
strategy:
fail-fast: false
steps:
- uses: ros-tooling/setup-ros@0.6.2
- uses: ros-tooling/setup-ros@v0.7
with:
required-ros-distributions: ${{ inputs.ros_distro }}
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
- uses: ros-tooling/action-ros-ci@0.3.2
- uses: ros-tooling/action-ros-ci@v0.3
with:
target-ros2-distro: ${{ inputs.ros_distro }}
# build all packages listed in the meta package
Expand Down
4 changes: 4 additions & 0 deletions robotiq_controllers/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ if(BUILD_TESTING)
# ament_uncrustify and ament_clang_format cannot both be satisfied
set(ament_cmake_uncrustify_FOUND TRUE)

# the following skips xmllint
# ament_xmllint requires network and can timeout if on throttled networks
set(ament_cmake_xmllint_FOUND TRUE)

ament_lint_auto_find_test_dependencies()
endif()

Expand Down

0 comments on commit 79d0303

Please sign in to comment.