Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
fmauch committed Feb 28, 2024
2 parents 867b106 + 92905ae commit 4f68c1c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 15 deletions.
1 change: 0 additions & 1 deletion .github/actions/set-package-list/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ description: 'Get a list of packages in the given path'
inputs:
path:
description: 'Path to the repository after checkout'
required: true
outputs:
package_list:
description: "A white-space separated list of packages"
Expand Down
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ updates:
directory: "/"
schedule:
interval: "weekly"
ignore:
- dependency-name: "codecov/codecov-action"
12 changes: 0 additions & 12 deletions .github/workflows/reusable-build-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ on:
CODECOV_TOKEN:
required: true

env:
# this will be src/{repo-owner}/{repo-name}
path: src/${{ github.repository }}

jobs:
coverage:
name: coverage build ${{ inputs.ros_distro }}
Expand All @@ -28,12 +24,8 @@ jobs:
with:
required-ros-distributions: ${{ inputs.ros_distro }}
- uses: actions/checkout@v4
with:
path: ${{ env.path }}
- id: package_list_action
uses: ros-controls/ros2_control_ci/.github/actions/set-package-list@master
with:
path: ${{ env.path }}
- uses: ros-tooling/[email protected]
with:
target-ros2-distro: ${{ inputs.ros_distro }}
Expand All @@ -50,17 +42,13 @@ jobs:
}
}
colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
- name: Workaround for codecov/feedback#263
run: |
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- uses: codecov/codecov-action@v4
with:
fail_ci_if_error: true
file: ros_ws/lcov/total_coverage.info
flags: unittests
name: codecov-umbrella
token: ${{ secrets.CODECOV_TOKEN }}
working-directory: ${{ env.path }}
verbose: true

- uses: actions/[email protected]
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/reusable-rhel-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ jobs:
if [[ -n "${{ inputs.upstream_workspace }}" ]]; then
vcs import src < ${{ env.path }}/${{ inputs.upstream_workspace }}
fi
rosdep update
rosdep install -iyr --from-path src || true
dnf check-update || true # update the cache but don't fail if there are updates available
rosdep update --rosdistro ${{ inputs.ros_distro }}
rosdep install -iyr --from-path src || true # ignore errors, as some packages might not be available
- id: package_list_action
uses: ros-controls/ros2_control_ci/.github/actions/set-package-list@master
with:
Expand Down

0 comments on commit 4f68c1c

Please sign in to comment.