Skip to content

Commit

Permalink
Merge branch 'humble' into ci/reviewer_lottery_humble
Browse files Browse the repository at this point in the history
  • Loading branch information
christophfroehlich authored Dec 24, 2023
2 parents 469df91 + 0f3c399 commit 7a62b94
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
container:
image: ubuntu:jammy
steps:
- uses: ros-tooling/setup-ros@v0.6
- uses: ros-tooling/setup-ros@v0.7
with:
required-ros-distributions: ${{ env.ROS_DISTRO }}
- uses: actions/checkout@v3
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
file: ros_ws/lcov/total_coverage.info
flags: unittests
name: codecov-umbrella
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: colcon-logs-coverage-ubuntu-22.04
path: ros_ws/log
2 changes: 1 addition & 1 deletion .github/workflows/ci-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4.6.0
- uses: actions/setup-python@v5.0.0
with:
python-version: '3.10'
- name: Install system hooks
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-ros-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
AMENT_CPPCHECK_ALLOW_SLOW_VERSIONS: true
steps:
- uses: actions/checkout@v3
- uses: ros-tooling/setup-ros@v0.6
- uses: ros-tooling/setup-ros@v0.7
- uses: ros-tooling/action-ros-lint@v0.1
with:
distribution: rolling
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
linter: [cpplint]
steps:
- uses: actions/checkout@v3
- uses: ros-tooling/setup-ros@v0.6
- uses: ros-tooling/setup-ros@v0.7
- uses: ros-tooling/action-ros-lint@v0.1
with:
distribution: rolling
Expand Down

0 comments on commit 7a62b94

Please sign in to comment.